Make sure defines match for evdev touch.

Also remove use of thread, which is not necessary for Mer.