Android CTS 8.0 Release 25 (6952894)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"