Merge "Update makefiles following gyp r1857 cherrypick."