am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"

* commit 'a74774fd9146aa22801487d3652dc18e9e328b8e':
  stagefright aacenc: Mark codeWord as UWord16