Merge "Parse external/cibu-fonts/fonts.mk." into jb-dev