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

Change-Id: I85f2608abf596d69e9a0fdbad02184284b3598ef