Android CTS 6.0 Release 21 (4214424)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"