Merge pull request #21108 from tianon/detect-daemon-osarch

Adjust "hack/make/.detect-daemon-osarch" to be the source of truth for "platform detection"