Merge "Remove goto from android_view_MotionEvent"