Sync up with r21-4-22-chise-0_24-jis-x0213-rep-diffs.