Merge "SDK: Add missing tool dependencies"