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

android_webview/java/src/org/chromium/android_webview/AwContentViewClient.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.android_webview;
 
 import android.content.Context;
 import android.content.Intent;
 import android.view.KeyEvent;
 import android.view.View;
@@ skipping 134 matching lines @@
     /**
      * Called to show the web contents in embedded mode.
      */
     public void exitFullscreen() {
         if (mCustomView != null) {
             mCustomView = null;
             mAwContents.exitFullScreen();
             mAwContentsClient.onHideCustomView();
         }
     }
+
+    @Override
+    public String getProductVersion() {
+        return AwContentsStatics.getProductVersion();
+    }
 }