Android 6.0.1 release 11
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"