Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r3" into nougat-mr1-cts-dev am: c5c34a2dad  -s ours
am: c290506e7c

Change-Id: I056e0bf4cd414b3f4208d9e4624e5fc3a46d763b