Merge "Fix class hierarchy in MotionEventCompat" into nyc-dev