Android CTS 7.0 Release 6 (3670477)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"