Merge pull request #19076 from tianon/multiarch

Refactor multi-arch support (especially for new mostly-official multi-arch official images)