Merge "Merge "Revert "Update test case name for new Stagefright test"" into marshmallow-cts-dev am: 7b17d6f1ab" into nougat-cts-dev
am: e94469ae95

Change-Id: I989bae0e8057405a13bab346278a6db982b067a0