Cleanup IFPF_* interfaces.

core/fxge/android/fpf_skiamodule.h

Index: core/fxge/android/fpf_skiamodule.h
diff --git a/core/fxge/android/fpf_skiamodule.h b/core/fxge/android/fpf_skiamodule.h
index 95748493c790daff22db28b1fcc8b6826c68d278..8ad7549cf102e4426be175554b00eaf78aacc464 100644
--- a/core/fxge/android/fpf_skiamodule.h
+++ b/core/fxge/android/fpf_skiamodule.h
@@ -7,24 +7,28 @@
 #ifndef CORE_FXGE_ANDROID_FPF_SKIAMODULE_H_
 #define CORE_FXGE_ANDROID_FPF_SKIAMODULE_H_
 
+#include "core/fxcrt/include/fx_system.h'"
+
 #if _FX_OS_ == _FX_ANDROID_
 
-#include "core/fxge/include/fpf.h"
+#include "core/fxge/android/fpf_skiafontmgr.h"
 
 class CFPF_SkiaFontMgr;
 
-class CFPF_SkiaDeviceModule : public IFPF_DeviceModule {
+class CFPF_SkiaDeviceModule {
  public:
   CFPF_SkiaDeviceModule() : m_pFontMgr(nullptr) {}
-  ~CFPF_SkiaDeviceModule() override;
+  ~CFPF_SkiaDeviceModule();
 
-  // IFPF_DeviceModule
-  void Destroy() override;
-  IFPF_FontMgr* GetFontMgr() override;
+  void Destroy();
+  CFPF_SkiaFontMgr* GetFontMgr();
 
  protected:
   CFPF_SkiaFontMgr* m_pFontMgr;
 };
-#endif
+
+CFPF_SkiaDeviceModule* CFPF_GetSkiaDeviceModule();
+
+#endif  // _FX_OS_ == _FX_ANDROID_
 
 #endif  // CORE_FXGE_ANDROID_FPF_SKIAMODULE_H_