Nw.gypi merge