[automerger skipped] Merge "DO NOT MERGE Rename testStagefright_b72165027 to meet naming standards" into marshmallow-cts-dev am: 9da4505f -s ours skipped: 281e57bb Change-Id: Ic5f1edf72ba8129d8990aa5df989039068d6b3b2