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

Change-Id: I9a0e16001bf97543df2de1b58cd79560cf1f6dfd