Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r13" into marshmallow-cts-dev am: a34d54c716  -s ours am: f46d268d75 am: ebbf2ce624 am: 1719f16fdb am: 37e364b8d5  -s ours
am: 303896af1e

Change-Id: Ic2769ad44fb80b4aa9cbfe9a48e95003fbf4fb67