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