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

* commit '9e3d957599c76ba19e23fd25b75ccc02d54efe3e':
  stagefright aacenc: Add prototypes for arm specific implementations of functions
tree: 97ecb3f86bcd15f19071af6b94c7f7aade4a7fa0
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/