Remove android_webview_build conditions from various places.

tools/imagediff/image_diff.gyp

Index: tools/imagediff/image_diff.gyp
diff --git a/tools/imagediff/image_diff.gyp b/tools/imagediff/image_diff.gyp
index c07fcf3c25db716b1feb4e3140c7097b783659e7..91ffa0451716000f85c29511ec1e37cacee4c88a 100644
--- a/tools/imagediff/image_diff.gyp
+++ b/tools/imagediff/image_diff.gyp
@@ -25,14 +25,11 @@
         'image_diff_png.cc',
       ],
       'conditions': [
-       ['OS=="android" and android_webview_build==0', {
+       ['OS=="android"', {
          # The Chromium Android port will compare images on host rather
          # than target (a device or emulator) for performance reasons.
          'toolsets': ['host'],
        }],
-       ['OS=="android" and android_webview_build==1', {
-         'type': 'none',
-       }],
       ],
     },
   ],