Merge "Fix gyp build"