Merge "Remove the obsolete mkfont.c and font_10x18.h" am: 8b9faa0008 am: dea56f6531
am: 34f593b84c

Change-Id: I8a5fd6e43bd53c6c1da8d23e94ee357a23ab3d69