Upstream the rest of skia diff

skia/ext/image_operations.cc

Index: skia/ext/image_operations.cc
diff --git a/skia/ext/image_operations.cc b/skia/ext/image_operations.cc
index 22d262a53a5f4e174217f87dc2022651e0841a5f..d92e92719fd9793b5fdb429a66a4d9722461a10a 100644
--- a/skia/ext/image_operations.cc
+++ b/skia/ext/image_operations.cc
@@ -367,7 +367,7 @@ SkBitmap ImageOperations::ResizeSubpixel(const SkBitmap& source,
                "dst_pixels", dest_width*dest_height);
   // Currently only works on Linux/BSD because these are the only platforms
   // where SkFontHost::GetSubpixelOrder is defined.
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
   // Understand the display.
   const SkFontHost::LCDOrder order = SkFontHost::GetSubpixelOrder();
   const SkFontHost::LCDOrientation orientation =
@@ -465,7 +465,7 @@ SkBitmap ImageOperations::ResizeSubpixel(const SkBitmap& source,
   return result;
 #else
   return SkBitmap();
-#endif  // OS_POSIX && !OS_MACOSX
+#endif  // OS_POSIX && !OS_MACOSX && !defined(OS_ANDROID)
 }
 
 // static