Reapply 1d3d8c0e5545b1f253dbe4c3525eeb2f1312b689, 93390ffc209b49d136d92581f55ce65a2f156b0b and 9f36c0d235f4eb7e6528face49c15045a5e41e14 to the non-aix parts of node.gyp