Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1