Merge "m4v_h263_enc_test: Fix leaks in error cases" am: bd88535d65 am: dfe305a92b
am: 4ccd50fc80

Change-Id: Id618ea723198c1bdcee6f1872d6b8a88ec544896