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

* commit 'aa86aa60dc5d89caf7d7edc545bc96fa133d64e8':
  stagefright aacenc: Fix inline asm
tree: 0ecbd0769f339854cca023a8cf56e75f0ba5aa63
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE