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