buildkernel broken for META_MODE

Hi,
	I ran into this error when trying to run a meta mode build (for the first time). It might be related to the recent assym* ordering changes.
Thanks!
-Ngie

$ cat /etc/src-env.conf
WITH_AUTO_OBJ=  yes
WITH_META_MODE= yes
UPDATE_DEPENDFILE=      yes
$ pwd
/usr/src
$ svnversion
316603M
$ svn st | grep -v \?
M       usr.bin/grep/tests/Makefile
$ env SRCCONF=/dev/null NO_FILEMON=1 script ~/bk.ts make buildkernel -j3
Script started on Fri Apr  7 11:52:38 2017
Command: time make buildkernel -j3
--- buildkernel ---
make[1]: "/usr/src/Makefile.inc1" line 146: SYSTEM_COMPILER: Determined that CC=cc matches the source tree.  Not bootstrapping a cross-compiler.
--- buildkernel ---
--------------------------------------------------------------
>>> Kernel build for GENERIC started on Fri Apr  7 11:52:39 PDT 2017
--------------------------------------------------------------
===> GENERIC
mkdir -p /usr/obj/usr/src/sys
--------------------------------------------------------------
>>> stage 1: configuring the kernel
--------------------------------------------------------------
...
Building /usr/obj/usr/obj/usr/src/sys/GENERIC/acpi_quirks.h
Building /usr/obj/usr/obj/usr/src/sys/GENERIC/feeder_eq_gen.h
Building /usr/obj/usr/obj/usr/src/sys/GENERIC/feeder_rate_gen.h
Building /usr/obj/usr/obj/usr/src/sys/GENERIC/snd_fxdiv_gen.h
Building /usr/obj/usr/obj/usr/src/sys/GENERIC/miidevs.h
Building /usr/obj/usr/obj/usr/src/sys/GENERIC/pccarddevs.h
Building /usr/obj/usr/obj/usr/src/sys/GENERIC/teken_state.h
Building /usr/obj/usr/obj/usr/src/sys/GENERIC/usbdevs.h
Building /usr/obj/usr/obj/usr/src/sys/GENERIC/vnode_if.h
Building /usr/obj/usr/obj/usr/src/sys/GENERIC/ia32_genassym.o
--- ia32_genassym.o ---
<built-in>:1:10: fatal error: 'opt_global.h' file not found
#include "opt_global.h"
         ^~~~~~~~~~~~~~
1 error generated.
*** [ia32_genassym.o] Error code 1

make[2]: stopped in /usr/obj/usr/src/sys/GENERIC
.ERROR_TARGET='ia32_genassym.o'
.ERROR_META_FILE='/usr/obj/usr/obj/usr/src/sys/GENERIC/ia32_genassym.o.meta'