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

* commit 'a887ff9ae61f6cb925feb6e08643716ac28e35db':
  stagefright aacenc: Simplify the definition of __inline