Android CTS 6.0 Release 31 (4890202)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"