OS(ANDROID) should not imply OS(LINUX)

Source/web/linux/WebFontRendering.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "WebFontRendering.h"
 
 #include "core/platform/graphics/FontPlatformData.h"
 
-#if OS(LINUX) && !OS(ANDROID)
+#if OS(LINUX)
 #include "WebFontInfo.h"
 #endif
 
 using WebCore::FontPlatformData;
 
 namespace WebKit {
 
 // static
 void WebFontRendering::setHinting(SkPaint::Hinting hinting)
 {
@@ skipping 21 matching lines @@
 // static
 void WebFontRendering::setSubpixelRendering(bool useSubpixelRendering)
 {
     FontPlatformData::setSubpixelRendering(useSubpixelRendering);
 }
 
 // static
 void WebFontRendering::setSubpixelPositioning(bool useSubpixelPositioning)
 {
     FontPlatformData::setSubpixelPositioning(useSubpixelPositioning);
-#if OS(LINUX) && !OS(ANDROID)
+#if OS(LINUX)
     WebFontInfo::setSubpixelPositioning(useSubpixelPositioning);
 #endif
 }
 
 // static
 void WebFontRendering::setLCDOrder(SkFontHost::LCDOrder order)
 {
     SkFontHost::SetSubpixelOrder(order);
 }
 
 // static
 void WebFontRendering::setLCDOrientation(SkFontHost::LCDOrientation orientation)
 {
     SkFontHost::SetSubpixelOrientation(orientation);
 }
 
 } // namespace WebKit