Re-merge fixes for bug 1362, bug 1666, bug 1863, KhronosRI and bld.inf.
#include "snow18n.bdf"Typeface Test Name "BDFTest" Proportional FontBitmaps snow18n EndFontBitmapsEndTypefaceFontStoreFile CollectionUid 3350 Typefaces Test EndTypefacesEndFontStoreFile