Update submodules and replace set-field OXM hack

Reviewer: @poolakiran