Android CTS 8.1 Release 22 (7116318)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"