am 05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1

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