Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r16" into nougat-mr1-cts-dev am: bf6ca540b3  -s ours" into oreo-cts-dev
am: 27db227b4d  -s ours

Change-Id: I131670572e1c1d3e7da841a7e2e9be9420f51f88