Android VTS 12.1 Release 7 (10477833)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"