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

* commit '2accfc110a71add56f5e4c35228e88dfa3024676':
  stagefright aacenc: Fix an inline asm constraint