am faf38b24: am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm...
am faf38b24: am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions"
* commit 'faf38b24':
stagefright aacenc: Add prototypes for arm specific implementations of functions