Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80  -s ours am: fad5398de5 am: cf2a6021d6 am: 5fe7870a08 am: 226ad6dc44  -s ours am: 12a6380740
am: 0e91dd76be

Change-Id: I0163100ffbec1fc6ac610dd73881e2a0b996651a