Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame."...
Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev am: da924b45 am: fdfad589
am: f3383881 -s ours
Change-Id: Ida0671401c4323f61ff63c4954522171efa2bcca