Android CTS 8.0 Release 6 (4591581)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"