Android CTS 6.0 Release 17 (3866870)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"