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

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