Android CTS 7.1 Release 20 (4892579)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"