am 41087f79: am d7ab4e0c: am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"

* commit '41087f7920196f81a50f320c9d538b36534f178d':
  stagefright aacenc: Fix inline asm constraints