am 97348431: am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5

* commit '9734843102c074c56ac72e221db0f51ae2fa79ec':
  stagefright aacenc: Use QDADD/QDSUB instructions
  stagefright aacenc: Remove useless inline asm for simple right shift
  stagefright aacenc: Use ARMv6 SSAT instruction