Fix Cardboard trigger (broken by GVR update)

chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShell.java

Index: chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShell.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShell.java b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShell.java
index 18be15a8bc6a6c6bbd8d4389c45b62ac74552bc2..7d80a6ab6857cff96a7e5371ca75d139159e6e7f 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShell.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShell.java
@@ -93,7 +93,6 @@ public class VrShell extends GvrLayout implements GLSurfaceView.Renderer, VrShel
 
         @Override
         public boolean dispatchTouchEvent(MotionEvent event) {
-            VrShell.this.onTouchEvent(event);
             return true;
         }
     }
@@ -258,6 +257,15 @@ public class VrShell extends GvrLayout implements GLSurfaceView.Renderer, VrShel
     }
 
     @Override
+    public boolean dispatchTouchEvent(MotionEvent event) {
+        if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
+            nativeOnTriggerEvent(mNativeVrShell);
+        }
+        // Don't mark this as handled so that Daydream screen alignment still functions.
+        return false;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         if (mNativeVrShell != 0) {
@@ -321,15 +329,6 @@ public class VrShell extends GvrLayout implements GLSurfaceView.Renderer, VrShel
     }
 
     @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
-            nativeOnTriggerEvent(mNativeVrShell);
-        }
-
-        return true;
-    }
-
-    @Override
     public FrameLayout getContainer() {
         return (FrameLayout) this;
     }