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

Change-Id: Ia5aa768df1f47709d9cef1797036ebe5df4e2386