Merge "Keep AACEncoder around for a bit longer to have more time fix issues related to video editor engine"
tree: 100f6bd4818912764f1e82820ac0a14d38a2c96f
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/