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"