rebase to master
Merge branch 'touch' of github.com:speedpat/ozone-wayland into touch

Conflicts:
	wayland/input/touchscreen.cc