Update from https://crrev.com/311076

skia/config/SkUserConfig.h

 /*
  * Copyright (C) 2006 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
@@ skipping 189 matching lines @@
 #define SK_BUILD_FOR_WIN
 
 // Skia uses this deprecated bzero function to fill zeros into a string.
 #define bzero(str, len) memset(str, 0, len)
 
 #elif defined(SK_BUILD_FOR_MAC)
 
 #define SK_CPU_LENDIAN
 #undef  SK_CPU_BENDIAN
 
-#elif defined(SK_BUILD_FOR_UNIX)
+#elif defined(SK_BUILD_FOR_UNIX) || defined(SK_BUILD_FOR_ANDROID)
 
 // Prefer FreeType's emboldening algorithm to Skia's
 // TODO: skia used to just use hairline, but has improved since then, so
 // we should revisit this choice...
 #define SK_USE_FREETYPE_EMBOLDEN
 
-#ifdef SK_CPU_BENDIAN
+#if defined(SK_BUILD_FOR_UNIX) && defined(SK_CPU_BENDIAN)
 // Above we set the order for ARGB channels in registers. I suspect that, on
 // big endian machines, you can keep this the same and everything will work.
 // The in-memory order will be different, of course, but as long as everything
 // is reading memory as words rather than bytes, it will all work. However, if
 // you find that colours are messed up I thought that I would leave a helpful
 // locator for you. Also see the comments in
 // base/gfx/bitmap_platform_device_linux.h
 #error Read the comment at this location
 #endif
 
@@ skipping 32 matching lines @@
 #endif
 
 #ifndef    SK_SUPPORT_LEGACY_GETDEVICE
 #   define SK_SUPPORT_LEGACY_GETDEVICE
 #endif
 
 #ifndef    SK_SUPPORT_LEGACY_PUBLIC_IMAGEINFO_FIELDS
 #   define SK_SUPPORT_LEGACY_PUBLIC_IMAGEINFO_FIELDS
 #endif
 
-#ifndef    SK_SUPPORT_LEGACY_GRADIENT_PRECISION
-#   define SK_SUPPORT_LEGACY_GRADIENT_PRECISION
-#endif
-
 #ifndef    SK_IGNORE_ETC1_SUPPORT
 #   define SK_IGNORE_ETC1_SUPPORT
 #endif
 
 #ifndef    SK_IGNORE_GPU_DITHER
 #   define SK_IGNORE_GPU_DITHER
 #endif
 
 #ifndef SK_SUPPORT_LEGACY_ADDOVAL
 #   define SK_SUPPORT_LEGACY_ADDOVAL
 #endif
 
 #ifndef SK_SUPPORT_LEGACY_ADDRRECT
 #   define SK_SUPPORT_LEGACY_ADDRRECT
 #endif
 
 #ifndef SK_IGNORE_GPU_LAYER_HOISTING
 #   define SK_IGNORE_GPU_LAYER_HOISTING
 #endif
 
-#ifndef SK_SUPPORT_LEGACY_DRAWDATA
-#   define SK_SUPPORT_LEGACY_DRAWDATA
-#endif
-
-#ifndef SK_SUPPORT_LEGACY_CANVAS_VIRTUAL
-#   define SK_SUPPORT_LEGACY_CANVAS_VIRTUAL
-#endif
-
 // If this goes well, we can have Skia respect DYNAMIC_ANNOTATIONS_ENABLED directly.
 #if DYNAMIC_ANNOTATIONS_ENABLED
 #    define SK_DYNAMIC_ANNOTATIONS_ENABLED 1
 #endif
 
 // ===== End Chrome-specific definitions =====
 
 #endif