Android CTS 7.0 Release 31 (5450832)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"