am c4738293: (-s ours) am 05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1

* commit 'c4738293527618f9a228c3f0f645c0a0704ada9c':
  DO NOT MERGE: Remove the AVI extractor.
tree: 6a3dcfe5e1ffcc3d3f839e19ded8b645f352f51e
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/