Clean up interwiki map

Also, split the ones that actually need to bypass the proxy from the others.

Change-Id: I9c192c78b1b7b64c8429810b926184713690be52
Merge "Clean up interwiki map"