Enable x86 building in the kernel task and also patch the main.mk
to list included makefiles

Change-Id: I204ba2adccf0e1d8ae619a0485c58e4d08bf1e88