Name core/fxge/android files appropriately and use one file per class

core/fxge/android/cfpf_skiafilefont.h

Index: core/fxge/android/cfpf_skiafilefont.h
diff --git a/core/fxge/android/cfpf_skiafilefont.h b/core/fxge/android/cfpf_skiafilefont.h
new file mode 100644
index 0000000000000000000000000000000000000000..b6657bf9789c6b938dcbb7735d9b6f79f896ef55
--- /dev/null
+++ b/core/fxge/android/cfpf_skiafilefont.h
@@ -0,0 +1,25 @@
+// Copyright 2016 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#ifndef CORE_FXGE_ANDROID_CFPF_SKIAFILEFONT_H_
+#define CORE_FXGE_ANDROID_CFPF_SKIAFILEFONT_H_
+
+#include "core/fxge/android/cfpf_skiafontdescriptor.h"
+
+class IFX_SeekableReadStream;
+
+#define FPF_SKIAFONTTYPE_File 2
+
+class CFPF_SkiaFileFont : public CFPF_SkiaFontDescriptor {
+ public:
+  CFPF_SkiaFileFont() : m_pFile(nullptr) {}
+
+  // CFPF_SkiaFontDescriptor
+  int32_t GetType() const override { return FPF_SKIAFONTTYPE_File; }
+  IFX_SeekableReadStream* m_pFile;
+};
+
+#endif  // CORE_FXGE_ANDROID_CFPF_SKIAFILEFONT_H_