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

Change-Id: I52f246b2a4d38033ba364b0d900cef5ad4824ffe