revert to short names for china/taiwan flag icons (bug 1041520)

This fixes the immediate problem, but does highlight that we localize china and taiwan to cn / tw in some places and zh-cn / zh-tw in other places. I don't know how big a deal that is.
I thought I was un-adding it because it was added in a different PR. Will un-un-add it.