Specify paths to build tools correctly or else bugfixes will not applied. (cherry picked from commit 4cc4e3f)
4cc4e3f