Merge "CTS test fix for testStagefright_cve_2017_13279" into oc-dev am: 643c99d53b am: 1fb0022b8a am: fbf9995038

Change-Id: If6a0c8e90eda8831ce16dff3068611a1e10a4855