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

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