Android VTS 12.1 Release 2 (8513557)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"