Merge "Merge "Merge "Update test case name for new Stagefright test" into marshmallow-cts-dev am: 6a4edf34a0" into nougat-cts-dev am: 09e61c0aef" into nougat-mr1-cts-dev
am: 6ea4e1e7d4

Change-Id: Ia510d7c7064a4ecbd9d2fc00a814f0221856f660