am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"

* commit 'bf1e85bfc8293646d57f0017afbfb0e09a1a41d7':
  stagefright aacenc: Fix inline asm constraints