Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r18" into marshmallow-cts-dev am: f649c6f3a4  -s ours am: b8359f2596 am: 09b860145b am: b3bb0247de am: 95887a6206  -s ours am: 065adab71f
am: e219c3e317

Change-Id: I8d28a48d431929db761551c0bfdcb0448957487a