Android 7.1.2 Release 6 (NHG47K)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"