am aa86aa60: am 1b704610: Merge "stagefright aacenc: Fix inline asm"

* commit 'aa86aa60dc5d89caf7d7edc545bc96fa133d64e8':
  stagefright aacenc: Fix inline asm