Merge "Add keylayout for original xbox controller" into qt-dev
am: aaaee164de

Change-Id: I7514aca0526045e4f0ed295775cc86b016e2f339