Merge "Remove unused AVI extractor"
am: e0b256a5a2

Change-Id: I9a975795400b42e34136090017a1cf4e55e652ae