am bf826923: am faf38b24: am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions"

* commit 'bf8269238be1c5bde9f82a986fb128d9a80f250b':
  stagefright aacenc: Add prototypes for arm specific implementations of functions