Merge branch 'master' into kumimoji

Fix meta-Makefile
Modify Makefile

... to generate cidpua-kumimoji.map