Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r12" into nougat-mr1-cts-dev am: 011dc05ac7  -s ours" into oreo-cts-dev am: 433b43dda0  -s ours am: 28c475dece am: 1346f859ca am: e8cef458e6  -s ours" am: c996603348  -s ours am: 881aae0767
am: f5fc63c3d2  -s ours

Change-Id: Ied484eeb48f3dcb9b9caa410b994bf06bd6bec21