Sync gyp_xwalk with upstream gyp_chromium

Synced to revision r258119.