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
am: 1326c9944b  -s ours

Change-Id: I533724068ecce4de803da96cf30d5d88497b3576