Android 7.1.2 Release 16 (NJH34C)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"