Android CTS 7.1 Release 13 (4486237)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"