Android 7.0.0 Release 36 (NBD92Y)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"