am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5

* commit '704131cb7e4f9cc682ea57ed569375f9f289368e':
  stagefright aacenc: Use QDADD/QDSUB instructions
  stagefright aacenc: Remove useless inline asm for simple right shift
  stagefright aacenc: Use ARMv6 SSAT instruction
tree: 008ba7c1dbf264c945f49d1d7d963e677d9498e9
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/