Merge "Modify the interface of HanziToPinyin class to make it generic and add test class"