Android 7.1.1 Release 33 (N4F26X)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"