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

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