Merge "Revert "Fix build failure in fuel base & qemu""