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  -s ours am: c3c67fef" into oc-dev-plus-aosp
am: 1636cf6e

Change-Id: I734929766a2c6c51fd2557f95feb0dfd059b07da