Sync up with r21-2-44-utf-2000-m0_18-simplified-jp-jouyou.