Remove zh-[cn|tw] in favour of zh-han[s|t]

Change-Id: I9b16b6422bff2abd7f991452449f03282330d244