am 2663b14f: (-s ours) Reconcile with klp-release - do not merge

* commit '2663b14f0f31038d718bbfe0fc203c1b792fcf47':
  Revert "Monkey support for swipes from the sides of a device."