Cleanup of touch input and wakelocks

- Removed unneeded variable
- Made touch state and pointer id much nicer.
- Very minor formatting
Fixed comment removal
Merge pull request #1180 from Unkn0wn0ne/android-cleanup

Android: Cleanup of touch input clearing and wakelocks