Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.0_r13" into nougat-cts-dev
am: 9348a31a0a  -s ours

Change-Id: I44c9826f0f772919f14c32d45e1ed252d448fcc4