Android CTS 7.1 Release 24 (5131712)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"