am f6497e45: Merge "Calling close() outside of the main thread breaks stuff."
am f6497e45: Merge "Calling close() outside of the main thread breaks stuff."

* commit 'f6497e45fae88788b1c67d815458355a1f2f65b5':
  Calling close() outside of the main thread breaks stuff.

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