Android CTS 9.0 Release 16 (7336947)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"