Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r8" into nougat-mr1-cts-dev am: 3f5706401b  -s ours
am: fe60b10ca3

Change-Id: I810b7a5636d0101d2b02373ec3e830265f499441