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

* commit '7416762be023e31b86bc71210c963d43522dedc5':
  Add keylayout for Xbox One controller