Revert 139139 - Revert 139125 - Switch use_canvas_skia=1 for Linux/GTK.

This is so we can get rid of canvas_linux.cc and start
standardizing what the different canvas flags mean
between platforms.

BUG=105550, 130001
TEST=No visual change in Chrome UI.

Review URL: https://chromiumcodereview.appspot.com/10452023

[email protected]
Review URL: https://chromiumcodereview.appspot.com/10444039

[email protected]
Review URL: https://chromiumcodereview.appspot.com/10444088

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139534 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/build/common.gypi b/build/common.gypi
index 65aa2d65..479e5f40 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -497,7 +497,7 @@
         #
         # On Aura, this allows per-tile painting to be used in the browser
         # compositor.
-        ['use_aura==1 or OS=="win"', {
+        ['OS!="mac" and OS!="android"', {
           'use_canvas_skia%': 1,
         }],
       ],