am a2ad5bdc: am 3c6fac2c: Merge "stagefright: propagate error in...
am a2ad5bdc: am 3c6fac2c: Merge "stagefright: propagate error in MPEG4Extractor::readMetaData" into lmp-dev
* commit 'a2ad5bdc':
stagefright: propagate error in MPEG4Extractor::readMetaData