am d5ee4b89: Merge "Build a different mksnapshot for each arch."

* commit 'd5ee4b89f462d11f8027aba6409b41aa94a4056a':
  Build a different mksnapshot for each arch.