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

Change-Id: If3f788da8e6c2af4257a9e5e6e1145d4ace5dbc2