Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80  -s ours am: 7f203e5d1f  -s ours am: 1795ae05dd am: e86f75e926 am: 5783ce6c82
am: 89a16cff48

Change-Id: Ic44b6220adc61c1617f202c268aab0139501d813