Replace "amd64" build tags with "cgo" as appropriate, and remove where unnecessary

Signed-off-by: Andrew Page <admwiggin@gmail.com>
Merge pull request #7389 from tianon/replace-amd64-build-tags-with-cgo-as-appropriate

Replace amd64 build tags with cgo as appropriate