Merge "m4v_h263: fix global buffer overflow" into lmp-dev am: c41471f6df am: 643dd1d8d4 am: 7648415fc8
am: c52190750e

Change-Id: I1f5707d50bf6739cf2c279ffeaec1becb39c7a5f