Merge "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" into oreo-cts-dev
am: 4363a4df6e

Change-Id: Ie60310d3195d5ee879568b03fa8aaf6b9fd6f169