Merge "Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is...

Merge "Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am: da84963c am: b8dfff52 am: 5445ddc9  -s ours am: 8700c26a  -s ours am: b063a7ea am: 92fce7ec  -s ours am: 3627617c am: 671c88a8 am: 1feb9dca am: 29b80153  -s ours am: e68844ff am: bd6594ea am: 301e363e am: 8ea826e2 am: 4fa1ff89  -s ours am: 024216f3 am: aee0c0b5" into oc-dr1-dev-plus-aosp
am: 4a952481

Change-Id: I4f9805c5737f7226c9351d924b8b47c4253a77a4