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

Change-Id: I376e1f0dff36825ab73c45832f5dd3595b58bbe3