Re-merge KhronosRI and bld.inf fix.
EXPORTS ??0TestGdi@@QAE@XZ @ 1 NONAME ; public: __thiscall TestGdi::TestGdi(void)
?Construct@TestGdi@@QAEXPAVCBitmapDevice@@PAVCFbsBitGc@@AAVTDes16@@@Z @ 2 NONAME ; public: void __thiscall TestGdi::Construct(class CBitmapDevice *,class CFbsBitGc *,class TDes16 &)
?Test@TestGdi@@QAEHXZ @ 3 NONAME ; public: int __thiscall TestGdi::Test(void)
?ConstructL@TestGdi@@QAEXPAVCBitmapDevice@@PAVCFbsBitGc@@AAVTDes16@@@Z @ 4 NONAME ; void TestGdi::ConstructL(class CBitmapDevice *, class CFbsBitGc *, class TDes16 &)