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

core/fxge/android/cfpf_skiadevicemodule.cpp

Index: core/fxge/android/cfpf_skiadevicemodule.cpp
diff --git a/core/fxge/android/fpf_skiamodule.cpp b/core/fxge/android/cfpf_skiadevicemodule.cpp
similarity index 76%
rename from core/fxge/android/fpf_skiamodule.cpp
rename to core/fxge/android/cfpf_skiadevicemodule.cpp
index e541b2414f2d70bace69a47adf6116a506079cb2..7bdf64666f5d766a3119f4ad72484aa5ba1457b6 100644
--- a/core/fxge/android/fpf_skiamodule.cpp
+++ b/core/fxge/android/cfpf_skiadevicemodule.cpp
@@ -1,15 +1,12 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
+// 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
 
-#include "core/fxcrt/fx_system.h"
+#include "core/fxge/android/cfpf_skiadevicemodule.h"
 
-#if _FX_OS_ == _FX_ANDROID_
-
-#include "core/fxge/android/fpf_skiafontmgr.h"
-#include "core/fxge/android/fpf_skiamodule.h"
+#include "core/fxge/android/cfpf_skiafontmgr.h"
 
 namespace {
 
@@ -42,5 +39,3 @@ CFPF_SkiaFontMgr* CFPF_SkiaDeviceModule::GetFontMgr() {
   }
   return m_pFontMgr;
 }
-
-#endif  // _FX_OS_ == _FX_ANDROID_