am bdf8fa0c: Merge "Fix some destroy bugs" into jb-mr1-dev
am bdf8fa0c: Merge "Fix some destroy bugs" into jb-mr1-dev

* commit 'bdf8fa0c1b762d82b056fa8d929ceaff47ae241b':
  Fix some destroy bugs

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