Merge "Use more prebuilt build-tools"