Merge "Merge "Fix cts crash in testStagefright_cve_2015_3836" into marshmallow-cts-dev am: d4fe797f08" into nougat-cts-dev am: a1490fd005  -s ours am: ccc24a6731 am: a37549e1b7 am: df410012a3 am: 5477f9e47d
am: 638c1556ca

Change-Id: I3e326d13a9a92cd2c23b3843ea5b1c87748fde46