Android CTS 12.1 Release 4 (9267266)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"