am 853161a8: am 39d5c2d5: Merge "Revert "Switch to 64-bit host builds for libbcc tools.""

* commit '853161a8f4066732f6ff6ef9d20c569c03473083':
  Revert "Switch to 64-bit host builds for libbcc tools."