Merge 147389 "Hide non-coordinated scrollbars for Android M26"

Source/WebCore/rendering/RenderLayerBacking.cpp

Index: Source/WebCore/rendering/RenderLayerBacking.cpp
===================================================================
--- Source/WebCore/rendering/RenderLayerBacking.cpp	(revision 147451)
+++ Source/WebCore/rendering/RenderLayerBacking.cpp	(working copy)
@@ -1041,7 +1041,11 @@
             layer->setPosition(hBar->frameRect().location() - offsetFromRoot - offsetFromRenderer);
             layer->setSize(hBar->frameRect().size());
         }
+#if OS(ANDROID)
+        layer->setDrawsContent(false);
+#else
         layer->setDrawsContent(hBar);
+#endif
     }
     
     if (GraphicsLayer* layer = layerForVerticalScrollbar()) {
@@ -1050,7 +1054,11 @@
             layer->setPosition(vBar->frameRect().location() - offsetFromRoot - offsetFromRenderer);
             layer->setSize(vBar->frameRect().size());
         }
+#if OS(ANDROID)
+        layer->setDrawsContent(false);
+#else
         layer->setDrawsContent(vBar);
+#endif
     }
 
     if (GraphicsLayer* layer = layerForScrollCorner()) {