am c81f70b6: am 716bae33: am d84ab8b1: am e09e20ee: Merge "Revert "Fix memory leak where we close the descriptor instead of the file."" into lmp-dev
am c81f70b6: am 716bae33: am d84ab8b1: am e09e20ee: Merge "Revert "Fix memory leak where we close the descriptor instead of the file."" into lmp-dev

* commit 'c81f70b65be28493816ebccf23f8df0cd3c51890':
  Revert "Fix memory leak where we close the descriptor instead of the file."

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base