Improve detection of three/four finger swipes

This CL reduces the chance of falsely detecting a three or four finger
swipe as a two finger scroll.

- Keep track of the position of fingers when they start moving together
  so they aren't confused by stationary fingers wiggling.
- Make two finger scroll detection harder when there are more than two
  fingers present, or when fingers have changed.

BUG=b:111273978
TEST=Add tests to regression suite and no regressions on existing

Change-Id: I0c1f223041d6d19cae70944ddd78d7ecec2be2a6
Reviewed-on: https://chromium-review.googlesource.com/1130463
Commit-Ready: Sean O'Brien <seobrien@chromium.org>
Tested-by: Sean O'Brien <seobrien@chromium.org>
Reviewed-by: Sean O'Brien <seobrien@chromium.org>
2 files changed