Android CTS 8.1 Release 4 (4666912)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"