Android CTS 12.1 Release 2 (8602832)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"