am af60e56b: Revert "DO NOT MERGE Fix extraneous allocation and copying"
am af60e56b: Revert "DO NOT MERGE Fix extraneous allocation and copying"

* commit 'af60e56b39582ea90ccd7601cd06350a50bf6500':
  Revert "DO NOT MERGE Fix extraneous allocation and copying"

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