am e5f80f4b: am f7104136: Merge "Stop marking gamepads as keyboards" into jb-mr2-dev

* commit 'e5f80f4bec6c3a75d4ed5b870597cf6746d2cee4':
  Stop marking gamepads as keyboards