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

Change-Id: I1e3706b98548320da1c53fdaa3e523f84244a9d3