Merge "Add more build dependencies"