am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge" into ics-mr1
* commit '791a31832ab586f056c2bcab8e0515d4bb1e2f7a': DO NOT MERGE: Remove the AVI extractor.
This commit is contained in: