Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev am: da924b45e1 am: fdfad5899d am: f3383881ff  -s ours am: 486e62c5dd  -s ours am: 98a5397265 am: bb3d5445c9  -s ours am: 16531bf687
am: e138ca8b82

Change-Id: I5f55433da57c986167d638b4ea65edafb087b7b1