Android CTS 6.0 Release 16 (3736419)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"