Merge to XFA: Use override in more classes in core/

core/src/fxge/android/fpf_skiamodule.h

Index: core/src/fxge/android/fpf_skiamodule.h
diff --git a/core/src/fxge/android/fpf_skiamodule.h b/core/src/fxge/android/fpf_skiamodule.h
index 4f1c1193d88a4fb797a6a01fd730f774cc3abcc5..5d1da7be328086aac104a3937b7710e4240ab097 100644
--- a/core/src/fxge/android/fpf_skiamodule.h
+++ b/core/src/fxge/android/fpf_skiamodule.h
@@ -8,13 +8,19 @@
 #define CORE_SRC_FXGE_ANDROID_FPF_SKIAMODULE_H_
 
 #if _FX_OS_ == _FX_ANDROID_
+
+#include "../../../include/fxge/fpf.h"
+
 class CFPF_SkiaFontMgr;
+
 class CFPF_SkiaDeviceModule : public IFPF_DeviceModule {
  public:
-  CFPF_SkiaDeviceModule() : m_pFontMgr(NULL) {}
-  virtual ~CFPF_SkiaDeviceModule();
-  virtual void Destroy();
-  virtual IFPF_FontMgr* GetFontMgr();
+  CFPF_SkiaDeviceModule() : m_pFontMgr(nullptr) {}
+  ~CFPF_SkiaDeviceModule() override;
+
+  // IFPF_DeviceModule
+  void Destroy() override;
+  IFPF_FontMgr* GetFontMgr() override;
 
  protected:
   CFPF_SkiaFontMgr* m_pFontMgr;