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

* commit 'f10efbc15e458f50bb29fe9ad0653fb2e08fd8fb':
  make 64-bit builds into multiarch builds