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

Change-Id: I938893b36cb1b6a0693d0bc479498206d1369a7b