Android CTS 12.1 Release 7 (10547473)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"