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

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