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

Change-Id: I8d8a52c897c3347232c1a637ec0e528a13b0963a