am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge" into ics-mr1

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