DO NOT MERGE CTS version is now 6.0_r1

Bug: 21208382
Change-Id: If19708405d706ac974d8199e1ccafc40dd590a78
2 files changed