Merge \\\"DO NOT MERGE: Bump CTS to 6.0R8\\\" into marshmallow-cts-dev am: a286bc9f92  -s ours am: 7bebb3060a
am: 4a09d83632

Change-Id: I75f212faec80478c91f259751960dd9c8d82461b