Android CTS 7.0 Release 21 (4723847)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"