Merge "Fix build scripts for vbox_x86 target"