FIX: [droid] fix keyboard mappings
Merge pull request #2213 from koying/droidfixkeyboard

FIX: [droid] fix keyboard mappings