Android 6.0.0 release 4
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"