Android 7.1.1 Release 31 (N4F26U)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"