Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r18" into marshmallow-cts-dev am: f649c6f3a4  -s ours" into nougat-cts-dev am: 6965878431  -s ours" into nougat-mr1-cts-dev am: 16ab69900f  -s ours
am: 527607b603

Change-Id: I435cbf2e58320112210f60eba463af9d97fd58e4