Revert "fix error"

This reverts commit 88da2e3be7be5759125b18a7607630ea9575214e.
Revert "remove extras"

This reverts commit 2825b919570568443b98b5b9ebcd59db0029f19f.
Revert "Support GESTURE_SENSOR input device type with GestureService"

This reverts commit d49ad3ef1b0662f5dc2aa7e101cb927834d00d3f.