Remove zh-[sg|hk] in favour of zh-han[s|t]

Change-Id: I6fb471fb8ade3b7b4e7bf0c6ea20b666dfb96a14
Merge "Remove zh-[sg|hk] in favour of zh-han[s|t]"