Merge "Fix cts crash in testStagefright_cve_2015_3836" into marshmallow-cts-dev