Android CTS 7.1 Release 4 (3866195)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"