Merge "Remove unused AVI extractor" am: e0b256a5a2 am: 76121a012a
am: 2fd1f62aa8  -s ours

Change-Id: I667bc9b49f0edf3f96a56e409c74eefa0fd96905