am 550e4425: Merge "Build both 64- and 32-bit versions."

* commit '550e44253f2eb23b909c80c9a9717c2cc36b4b8b':
  Build both 64- and 32-bit versions.