Add CityHash back to Linux/iOS/etc.

This reverts commit ecfe43c1493d6cfec4e4af99f74ea7d286cf33de.