Update to include latest crosswalk plugin fixes