Merge "Remove unused AVIExtractor source" into nyc-dev