Merge "Update test case name for new Stagefright test" into marshmallow-cts-dev