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

android_webview/native/aw_contents_statics.cc

Index: android_webview/native/aw_contents_statics.cc
diff --git a/android_webview/native/aw_contents_statics.cc b/android_webview/native/aw_contents_statics.cc
index e3c49efbd140029a756f5d9c3255aef2856d5038..b0718851576c2ad9fa91ba833fa8290483a9c74c 100644
--- a/android_webview/native/aw_contents_statics.cc
+++ b/android_webview/native/aw_contents_statics.cc
@@ -100,12 +100,6 @@ void SetLegacyCacheRemovalDelayForTest(JNIEnv*,
 }
 
 // static
-ScopedJavaLocalRef<jstring> GetProductVersion(JNIEnv* env,
-                                              const JavaParamRef<jclass>&) {
-  return base::android::ConvertUTF8ToJavaString(env, PRODUCT_VERSION);
-}
-
-// static
 void SetServiceWorkerIoThreadClient(
     JNIEnv* env,
     const JavaParamRef<jclass>&,