am ac239a91: am 376aebdc: am 76d057b9: Merge "toolbox: fix x86 build"

* commit 'ac239a915b08823166657d6a3bfad094e57db0be':
  toolbox: fix x86 build