Android CTS 7.1 Release 3 (3764431)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"