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

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