fixup 5f5d8c86490510f49b82d05ff16011bfbf4cbfa8; re-add default joystick map
Merge pull request #5600 from koying/fixdroidjoystick

fixup 5f5d8c86490510f49b82d05ff16011bfbf4cbfa8; re-add default joystick map