Merge "Remove HanziToPinin.java"