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

Change-Id: Ifc2a51e91b421274eb7ae145347b7d907b618e52