Merge "Add keylayout for Xbox One controller" am: 7416762be0
am: 605d619b1e

* commit '605d619b1eeef901661c9536b7921ac47960d110':
  Add keylayout for Xbox One controller