Merge changes I46c81dba,If1f40e9c,I652eaaa5

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