Merge "Keylayout for xbox pdp controller" into qt-dev
am: 927d44d9eb

Change-Id: I53c9fd7d9e4b3770ff358bfb2f7806f78b969b58