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

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