Android CTS 7.1 Release 21 (4976769)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"