Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev am: da924b45e1 am: fdfad5899d
am: f3383881ff  -s ours

Change-Id: Ida0671401c4323f61ff63c4954522171efa2bcca