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

* commit '5b299d2f9038452aa09a97d4f2ce57ec20bbc06a':
  stagefright aacenc: Don't address a Word32 with a Word16 pointer