M39 Gardening : Fix xwalk.gyp due to upstream changes.