Fix a nasty scroll bug for Chrome Now-on-tap feature. Also combine the

android_webview/java/src/org/chromium/android_webview/AwContentsStatics.java

Index: android_webview/java/src/org/chromium/android_webview/AwContentsStatics.java
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContentsStatics.java b/android_webview/java/src/org/chromium/android_webview/AwContentsStatics.java
index 9e89add9ad054a3ee26103e6a0ab6f99154dfdda..e21739779261b4bac0db0e54ff83d8dff74c4a3c 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContentsStatics.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContentsStatics.java
@@ -86,10 +86,6 @@ public class AwContentsStatics {
         nativeSetLegacyCacheRemovalDelayForTest(timeoutMs);
     }
 
-    public static String getProductVersion() {
-        return nativeGetProductVersion();
-    }
-
     public static void setServiceWorkerIoThreadClient(AwContentsIoThreadClient ioThreadClient,
             AwBrowserContext browserContext) {
         nativeSetServiceWorkerIoThreadClient(ioThreadClient, browserContext);
@@ -103,7 +99,6 @@ public class AwContentsStatics {
     private static native void nativeSetDataReductionProxyEnabled(boolean enabled);
     private static native String nativeGetUnreachableWebDataUrl();
     private static native void nativeSetLegacyCacheRemovalDelayForTest(long timeoutMs);
-    private static native String nativeGetProductVersion();
     private static native void nativeSetServiceWorkerIoThreadClient(
             AwContentsIoThreadClient ioThreadClient, AwBrowserContext browserContext);
 }