Merge "Remove swap16/swap32/swap64 header pollution."