Android CTS 7.1 Release 5 (3943087)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"