Android CTS 8.1 Release 7 (4855739)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"