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 am: db79894072 am: a0032be82d
am: 419ae63486

Change-Id: I2de07daf12863a5c5e7ee673f125deb93da86641