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

Change-Id: Ic9b11c7e4313838f8a61ea63cd7a88f9798637c3