Merge "[automerger skipped] Merge "DO NOT MERGE - remove testStagefright_bug_34360591" into lollipop-mr1-cts-dev am: d564eb07ce  -s ours" into marshmallow-cts-dev
am: 6551f1f0ea  -s ours

Change-Id: I861628a19fae04e44eba46d1202255c8dfd9bdd2