Merge "Merge "DO NOT MERGE - m4v_h263: check header first before decoding a...

Merge "Merge "DO NOT MERGE - m4v_h263: check header first before decoding a frame." into klp-dev am: da924b45 am: fdfad589 am: f3383881  -s ours am: 486e62c5  -s ours am: 98a53972 am: bb3d5445  -s ours am: 16531bf6 am: e138ca8b am: cfd9b9b8 am: 2a930213  -s ours am: 2ab8c23b am: 975e2275 am: 529fc839 am: b17bb4e2 am: 43d484eb am: f70687a0  -s ours" into oc-dev-plus-aosp
am: 3a9b8b1a

Change-Id: I7c8ea311c40a0f7f282949d513ae6d7ebf1aec3d