Android CTS 6.0 Release 18 (3942491)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"