Merge "DO NOT MERGE Rename testStagefright_b72165027 to meet naming standards" into marshmallow-cts-dev