Android CTS 6.0 Release 25 (4485418)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"