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