Android CTS 8.1 Release 12 (5131724)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"