Android CTS 8.1 Release 21 (6952965)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"