Android CTS 12.1 Release 6 (10118587)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"