Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r17" into marshmallow-cts-dev
am: bcc6e62e06  -s ours

Change-Id: Ie344710cff6a71504fe8b664bfac53d8b97b21bd