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

Change-Id: I5437d87b29a8dfcd64ec26ba623e3e0c46b545ef
Merge "Remove zh-[cn|tw] in favour of zh-han[s|t]"