Merge "The software AAC encoder is now an OMX component."
tree: 90d8cd2881a75e25423eb015223273f31e2d1512
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/