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

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