[PR] Update builder from upstream Make 1.4.7