Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r13" into nougat-mr1-cts-dev am: 6d2fb82508  -s ours" into oreo-cts-dev am: 262d011d75  -s ours"