am 6bc542e0: am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer"
am 6bc542e0: am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer"

* commit '6bc542e0f31bcb7ce5ff466c7aa4676f6aa91f7d':
  stagefright aacenc: Don't address a Word32 with a Word16 pointer

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