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

Change-Id: Id975158b4e829eab3217f36a45846d86a0ae51b1