[PR] Update Make builder from upstream - 1.1.0 release