Change Guest Build System to use chroot headers for x86
Follow up from #1891 #1902