FIX: [droid] fix keyboard mappings

Conflicts:

	xbmc/android/activity/AndroidExtra.h
FIX: [droid] fix multitouch
CHG: [touch] allow generic multi-touch swipes