Merge "make 64-bit builds into multiarch builds"