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