Revert "Input: wacom - merge out and in prox events"

This reverts commit 776943fd as it
causes issues with ISDv4 E3 touchscreens:

	https://bugzilla.kernel.org/show_bug.cgi?id=15670



Signed-off-by: Dmitry Torokhov <dtor@mail.ru>