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

* commit '5aff259c61e54e441ed04bf77e3cc69a0374432d':
  stagefright aacenc: Don't address a Word32 with a Word16 pointer
tree: dd85860d8a0026982cdbb68fff8aee6bd08aba2e
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/