Android CTS 6.0 release 3
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"