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

Change-Id: Ie9390cd7b44c0d43ee2cd5d24f1a4f26444436a2