Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r22" into marshmallow-cts-dev am: 6a48394c66  -s ours am: 003bcd2902 am: 2fb33e9305 am: cdc5ae6bcf
am: 1308353861  -s ours

Change-Id: Ibaf3e70b1ebc68812dc12c2805fc9b4168c580cc