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

Change-Id: I5f901bf0ee8dc48946f7f1326999f74ad8181f7c