Android 7.0.0 release 15
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"