Merge "Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev am: 80059d44c4 am: 72840f2216 am: 9e9987c46d am: 9583ca702a  -s ours am: acf3c39437 am: d1ce7bb7c8 am: bd951d1c5c am: 570dd1184d am: 7475e7996a  -s ours am: 5652b2b4d9 am: 5a27b151ae" into oc-dr1-dev-plus-aosp