Merge "Build a different mksnapshot for each arch."