Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r15" into nougat-mr1-cts-dev
am: 485c16b4d3  -s ours

Change-Id: I0850f58e929a1d834a5b13e3c9e44227d9402db3