Fix bug 3083631 - Links no longer get tapped during scale gestures

Change-Id: I57bf740c5063f30d763fc720a3ad77edff20f867
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 6df5445..84aca60 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -5039,6 +5039,8 @@
                     if (!mAllowPanAndScale) {
                         return true;
                     }
+                    mPrivateHandler.removeMessages(SWITCH_TO_SHORTPRESS);
+                    mPrivateHandler.removeMessages(SWITCH_TO_LONGPRESS);
                 }
                 x = mScaleDetector.getFocusX();
                 y = mScaleDetector.getFocusY();