am 94474515: Merge "Prevent memory corruption from use-after-free" into lmp-mr1-dev automerge: bb8d7ff
am 94474515: Merge "Prevent memory corruption from use-after-free" into lmp-mr1-dev
automerge: bb8d7ff

* commit 'bb8d7ffeae187e8782a9494e252e335db537b2a1':
  Prevent memory corruption from use-after-free

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