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

* commit '376aebdc9d92efed4928523227381ea18a4cb0cc':
  toolbox: fix x86 build