Android CTS 8.0 Release 21 (5933210)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"