am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline"

* commit '1a864db7723a7947b72d24e6008ba48341d0feff':
  stagefright aacenc: Simplify the definition of __inline
tree: 3bc8e3eabbf105dd255ab478a84308d86e784a6e
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/