Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r7" into nougat-cts-dev am: 9e11570455  -s ours" into nougat-mr1-cts-dev am: 00fbd41f4b  -s ours
am: 91763bb31a

Change-Id: Iabf098e90a89a9653644f9f24a0a2fb954443e14