Merge pull request #1574 from seanpaultaylor/next

Finished Android gamepad support
Removed confusing ButtonMapping enum values and HID impl details