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

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