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

Change-Id: Iaa6daa03ea284ae1fef26f80bd121b379f108b89