DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r25

Change-Id: I88f5b84d9e885cdece4442b7610e590009535943
2 files changed