am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the...
am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1
* commit '2c2ed7be':
Fixes a typo in AVIExtractor that would advertise the wrong video dimensions