Merge GNU Make 4.2.1 into master

Test: none
Change-Id: Id4ee1eb80ac33ae1f44f55cd1832897aac1dc058