am 14c6e272: am 2accfc11: am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint"

* commit '14c6e2728c2ae39aab6fc9a9a77c402d7322afc0':
  stagefright aacenc: Fix an inline asm constraint