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

Change-Id: I7f0eca14d59fdf9d616974a8a3640d0d89341aaf