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

Change-Id: Ib7477355ce7e27cfd62713a51512c2eabc59d92c