Android 6.0.1 Release 47 (MMB30K)
Merge "tools/studio/cloud is now tools/studio/google/cloud/tools"