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

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