Merge "Merge "Fix cts crash in testStagefright_cve_2015_3836" into marshmallow-cts-dev am: d4fe797f08" into nougat-cts-dev
am: a1490fd005

Change-Id: Iba85cfe92264f062a8b6c7902e41cbd1410b3550