Merge "Update HanziToPinyin table and tests."