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

* commit '1b7046108c0f381fa8b7efaebae02c1a2b3099b3':
  stagefright aacenc: Fix inline asm
tree: b4009a76bf26daf8380cbebc1966cc39617ecf37
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/