am 481fed17: am f10efbc1: Merge "make 64-bit builds into multiarch builds"

* commit '481fed17fad5141154d8cf9532c0803ade24a6a6':
  make 64-bit builds into multiarch builds