Android CTS 7.1 Release 7 (4120758)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"