am 36bbc399: am d49dc106: Merge "Add FEATURE_GAMEPAD." into lmp-dev

* commit '36bbc3991bff010a9e55a1a117ff03ec84bc40e0':
  Add FEATURE_GAMEPAD.