Android CTS 7.0 Release 3 (3423912)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"