Merge "toolbox: fix x86 build"