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

Change-Id: I74c3cfb38b4e6c50f52708d78a2000e117f2beec