Merge "DO NOT MERGE: Bumping CTS/CTS Verifier version to CTS 6.0R2." into marshmallow-cts-dev