[automerger] Merge "Merge "Merge "Revert "Update test case name for new Stagefright test"" into marshmallow-cts-dev am: 7b17d6f1ab" into nougat-cts-dev am: e94469ae95" into nougat-mr1-cts-dev am: 0412a1c2aa am: 76f5fd6395 am: b774cdbcbb am: 3e758799c5
am: 4613b8d513

Change-Id: Ie5d65c8f0658960f7d8778854e537c8da8fb07dc