Merge "Refactor arch-specific Dockerfile patching"