From 7e641053f0ae8d6bd43f35d31e7cbf613088dd29 Mon Sep 17 00:00:00 2001
From: BigMajster <maszlij11@gmail.com>
Date: Sun, 23 Nov 2014 11:54:31 +0100
Subject: [PATCH] Keys and NFC checker update

Change-Id: I77ddaee79579609c9be30fe18e55795dae3784ed
---
 device_w7.mk                                  |   4 +-
 prebuilt/etc/init.d/10nfc_checker             |   2 +-
 prebuilt/etc/init.d/11keys_checker            |   8 +-
 prebuilt/etc/init.zetaw.post_boot.sh          |   5 +
 prebuilt/usr/idc/touch_dev.idc                |   3 -
 prebuilt/usr/keylayout/AVRCP.kl               |  23 -
 prebuilt/usr/keylayout/Generic-D410.kl        | 444 ++++++++++++++++++
 .../keylayout/{Generic.kl => Generic-D4x5.kl} |  36 +-
 .../usr/keylayout/Vendor_0079_Product_0011.kl |  23 -
 .../usr/keylayout/Vendor_045e_Product_028e.kl |  46 --
 .../usr/keylayout/Vendor_046d_Product_c216.kl |  37 --
 .../usr/keylayout/Vendor_046d_Product_c219.kl |  35 --
 .../usr/keylayout/Vendor_046d_Product_c21f.kl |  36 --
 .../usr/keylayout/Vendor_046d_Product_c294.kl |  53 ---
 .../usr/keylayout/Vendor_046d_Product_c299.kl |  62 ---
 .../usr/keylayout/Vendor_046d_Product_c532.kl | 133 ------
 .../usr/keylayout/Vendor_054c_Product_0268.kl |  76 ---
 .../usr/keylayout/Vendor_0583_Product_2060.kl |  27 --
 .../usr/keylayout/Vendor_05ac_Product_0239.kl | 119 -----
 .../usr/keylayout/Vendor_1038_Product_1412.kl |  31 --
 .../usr/keylayout/Vendor_12bd_Product_d015.kl |  27 --
 .../usr/keylayout/Vendor_1689_Product_fd00.kl |  38 --
 .../usr/keylayout/Vendor_1689_Product_fd01.kl |  36 --
 .../usr/keylayout/Vendor_1689_Product_fe00.kl |  36 --
 .../usr/keylayout/Vendor_1bad_Product_f016.kl |  36 --
 .../usr/keylayout/Vendor_1bad_Product_f023.kl |  35 --
 .../usr/keylayout/Vendor_1bad_Product_f027.kl |  36 --
 .../usr/keylayout/Vendor_1bad_Product_f036.kl |  36 --
 .../usr/keylayout/Vendor_1d79_Product_0009.kl |  40 --
 .../usr/keylayout/Vendor_22b8_Product_093d.kl | 105 -----
 .../usr/keylayout/Vendor_2378_Product_100a.kl |  35 --
 prebuilt/usr/keylayout/gpio-keys_d410.kl      |  35 --
 prebuilt/usr/keylayout/gpio-keys_d415.kl      |  33 --
 prebuilt/usr/keylayout/qwerty.kl              | 112 -----
 34 files changed, 482 insertions(+), 1361 deletions(-)
 mode change 100644 => 100755 prebuilt/etc/init.d/10nfc_checker
 mode change 100644 => 100755 prebuilt/etc/init.d/11keys_checker
 delete mode 100644 prebuilt/usr/keylayout/AVRCP.kl
 create mode 100644 prebuilt/usr/keylayout/Generic-D410.kl
 rename prebuilt/usr/keylayout/{Generic.kl => Generic-D4x5.kl} (95%)
 mode change 100644 => 100755
 delete mode 100644 prebuilt/usr/keylayout/Vendor_0079_Product_0011.kl
 delete mode 100644 prebuilt/usr/keylayout/Vendor_045e_Product_028e.kl
 delete mode 100644 prebuilt/usr/keylayout/Vendor_046d_Product_c216.kl
 delete mode 100644 prebuilt/usr/keylayout/Vendor_046d_Product_c219.kl
 delete mode 100644 prebuilt/usr/keylayout/Vendor_046d_Product_c21f.kl
 delete mode 100644 prebuilt/usr/keylayout/Vendor_046d_Product_c294.kl
 delete mode 100644 prebuilt/usr/keylayout/Vendor_046d_Product_c299.kl
 delete mode 100644 prebuilt/usr/keylayout/Vendor_046d_Product_c532.kl
 delete mode 100644 prebuilt/usr/keylayout/Vendor_054c_Product_0268.kl
 delete mode 100644 prebuilt/usr/keylayout/Vendor_0583_Product_2060.kl
 delete mode 100644 prebuilt/usr/keylayout/Vendor_05ac_Product_0239.kl
 delete mode 100644 prebuilt/usr/keylayout/Vendor_1038_Product_1412.kl
 delete mode 100644 prebuilt/usr/keylayout/Vendor_12bd_Product_d015.kl
 delete mode 100644 prebuilt/usr/keylayout/Vendor_1689_Product_fd00.kl
 delete mode 100644 prebuilt/usr/keylayout/Vendor_1689_Product_fd01.kl
 delete mode 100644 prebuilt/usr/keylayout/Vendor_1689_Product_fe00.kl
 delete mode 100644 prebuilt/usr/keylayout/Vendor_1bad_Product_f016.kl
 delete mode 100644 prebuilt/usr/keylayout/Vendor_1bad_Product_f023.kl
 delete mode 100644 prebuilt/usr/keylayout/Vendor_1bad_Product_f027.kl
 delete mode 100644 prebuilt/usr/keylayout/Vendor_1bad_Product_f036.kl
 delete mode 100644 prebuilt/usr/keylayout/Vendor_1d79_Product_0009.kl
 delete mode 100644 prebuilt/usr/keylayout/Vendor_22b8_Product_093d.kl
 delete mode 100644 prebuilt/usr/keylayout/Vendor_2378_Product_100a.kl
 delete mode 100644 prebuilt/usr/keylayout/gpio-keys_d410.kl
 delete mode 100644 prebuilt/usr/keylayout/gpio-keys_d415.kl
 delete mode 100644 prebuilt/usr/keylayout/qwerty.kl

diff --git a/device_w7.mk b/device_w7.mk
index 7fdb925..d93033f 100644
--- a/device_w7.mk
+++ b/device_w7.mk
@@ -73,8 +73,8 @@ PRODUCT_COPY_FILES += \
     device/lge/w7/prebuilt/etc/mixer_paths.xml:system/etc/mixer_paths.xml \
     device/lge/w7/prebuilt/etc/thermal-engine-8226.conf:system/etc/thermal-engine-8226.conf \
     device/lge/w7/prebuilt/usr/idc/touch_dev.idc:system/usr/idc/touch_dev.idc \
-    device/lge/w7/prebuilt/usr/keylayout/gpio-keys_d415.kl:system/usr/keylayout/gpio-keys_d415.kl \
-    device/lge/w7/prebuilt/usr/keylayout/gpio-keys_d410.kl:system/usr/keylayout/gpio-keys_d410.kl \
+    device/lge/w7/prebuilt/usr/keylayout/Generic-D4x5.kl:system/usr/keylayout/Generic-D4x5.kl \
+    device/lge/w7/prebuilt/usr/keylayout/Generic-D410.kl:system/usr/keylayout/Generic-D410.kl \
     device/lge/w7/prebuilt/etc/init.zetaw.fm.sh:system/etc/init.zetaw.fm.sh \
     device/lge/w7/prebuilt/etc/init.zetaw.ssr.wifi.sh:system/etc/init.zetaw.ssr.wifi.sh \
     device/lge/w7/prebuilt/etc/init.zetaw.wifi.sh:system/etc/init.zetaw.wifi.sh \
diff --git a/prebuilt/etc/init.d/10nfc_checker b/prebuilt/etc/init.d/10nfc_checker
old mode 100644
new mode 100755
index 101451b..fec9333
--- a/prebuilt/etc/init.d/10nfc_checker
+++ b/prebuilt/etc/init.d/10nfc_checker
@@ -7,6 +7,6 @@ if [ "$model" = "LG-D410" ] || [ "$model" = "LG-D405" ]; then
 	chmod 000 /system/etc/permissions/android.hardware.nfc.xml
 	chmod 000 /system/etc/permissions/android.hardware.nfc.hce.xml
 	chmod 000 /system/lib/hw/nfc_nci.w7.so
-	chmod 000 /system/app/NfcNci.apk
+	chmod 000 /system/app/NfcNci/NfcNci.apk
 	mount -o remount,ro /system
 fi
diff --git a/prebuilt/etc/init.d/11keys_checker b/prebuilt/etc/init.d/11keys_checker
old mode 100644
new mode 100755
index 85f6655..e237a35
--- a/prebuilt/etc/init.d/11keys_checker
+++ b/prebuilt/etc/init.d/11keys_checker
@@ -2,13 +2,11 @@
 
 model=`getprop ro.product.model`
 mount -o remount,rw /system
-rm /system/usr/keylayout/gpio-keys.kl
+rm /system/usr/keylayout/Generic.kl
 if [ "$model" = "LG-D410" ] || [ "$model" = "LG-D410hn" ]; then
-	ln -s /system/usr/keylayout/gpio-keys_d410.kl /system/usr/keylayout/gpio-keys.kl 
+	ln -s /system/usr/keylayout/Generic-D410.kl /system/usr/keylayout/Generic.kl
 else
-	ln -s /system/usr/keylayout/gpio-keys_d415.kl /system/usr/keylayout/gpio-keys.kl
+	ln -s /system/usr/keylayout/Generic-D4x5.kl /system/usr/keylayout/Generic.kl
 fi
-
 mount -o remount,ro /system
 
-
diff --git a/prebuilt/etc/init.zetaw.post_boot.sh b/prebuilt/etc/init.zetaw.post_boot.sh
index 82fd085..a905a85 100644
--- a/prebuilt/etc/init.zetaw.post_boot.sh
+++ b/prebuilt/etc/init.zetaw.post_boot.sh
@@ -26,6 +26,11 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+# Run model checker
+mount -o remount,rw /system
+find /system/etc/init.d -type f -exec chmod 755 {} \;
+mount -o remount,ro /system
+
 target=`getprop ro.board.platform`
 debuggable=`getprop ro.debuggable`
 case "$target" in
diff --git a/prebuilt/usr/idc/touch_dev.idc b/prebuilt/usr/idc/touch_dev.idc
index 65544f3..f865e80 100644
--- a/prebuilt/usr/idc/touch_dev.idc
+++ b/prebuilt/usr/idc/touch_dev.idc
@@ -25,7 +25,6 @@ touch.orientationAware = 1
 # Gesture Mode Parameters
 touch.gestureMode = spots
 
-
 # Size
 touch.size.calibration = geometric
 touch.size.scale = 1
@@ -45,5 +44,3 @@ touch.orientation.calibration = none
 
 touch.distance.calibration = none
 touch.distance.scale = 1
-
-keyboard.layout = gpio-keys
\ No newline at end of file
diff --git a/prebuilt/usr/keylayout/AVRCP.kl b/prebuilt/usr/keylayout/AVRCP.kl
deleted file mode 100644
index 736b43c..0000000
--- a/prebuilt/usr/keylayout/AVRCP.kl
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (C) 2010 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Key layout used for Bluetooth AVRCP support.
-
-key 200   MEDIA_PLAY          WAKE
-key 201   MEDIA_PAUSE         WAKE
-key 166   MEDIA_STOP          WAKE
-key 163   MEDIA_NEXT          WAKE
-key 165   MEDIA_PREVIOUS      WAKE
-key 168   MEDIA_REWIND        WAKE
-key 208   MEDIA_FAST_FORWARD  WAKE
diff --git a/prebuilt/usr/keylayout/Generic-D410.kl b/prebuilt/usr/keylayout/Generic-D410.kl
new file mode 100644
index 0000000..2cd9396
--- /dev/null
+++ b/prebuilt/usr/keylayout/Generic-D410.kl
@@ -0,0 +1,444 @@
+# Copyright (C) 2010 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# Generic key layout file for full alphabetic US English PC style external keyboards.
+#
+# This file is intentionally very generic and is intended to support a broad rang of keyboards.
+# Do not edit the generic key layout to support a specific keyboard; instead, create
+# a new key layout file with the required keyboard configuration.
+#
+
+key 1     ESCAPE
+key 2     1
+key 3     2
+key 4     3
+key 5     4
+key 6     5
+key 7     6
+key 8     7
+key 9     8
+key 10    9
+key 11    0
+key 12    MINUS
+key 13    EQUALS
+key 14    DEL
+key 15    TAB
+key 16    Q
+key 17    W
+key 18    E
+key 19    R
+key 20    T
+key 21    Y
+key 22    U
+key 23    I
+key 24    O
+key 25    P
+key 26    LEFT_BRACKET
+key 27    RIGHT_BRACKET
+key 28    ENTER
+key 29    CTRL_LEFT
+key 30    A
+key 31    S
+key 32    D
+key 33    F
+key 34    G
+key 35    H
+key 36    J
+key 37    K
+key 38    L
+key 39    SEMICOLON
+key 40    APOSTROPHE
+key 41    GRAVE
+key 42    SHIFT_LEFT
+key 43    BACKSLASH
+key 44    Z
+key 45    X
+key 46    C
+key 47    V
+key 48    B
+key 49    N
+key 50    M
+key 51    COMMA
+key 52    PERIOD
+key 53    SLASH
+key 54    SHIFT_RIGHT
+key 55    NUMPAD_MULTIPLY
+key 56    ALT_LEFT
+key 57    SPACE
+key 58    CAPS_LOCK
+key 59    F1
+key 60    F2
+key 61    F3
+key 62    F4
+key 63    F5
+key 64    F6
+key 65    F7
+key 66    F8
+key 67    F9
+key 68    F10
+key 69    NUM_LOCK
+key 70    SCROLL_LOCK
+key 71    NUMPAD_7
+key 72    NUMPAD_8
+key 73    NUMPAD_9
+key 74    NUMPAD_SUBTRACT
+key 75    NUMPAD_4
+key 76    NUMPAD_5
+key 77    NUMPAD_6
+key 78    NUMPAD_ADD
+key 79    NUMPAD_1
+key 80    NUMPAD_2
+key 81    NUMPAD_3
+key 82    NUMPAD_0
+key 83    NUMPAD_DOT
+# key 84 (undefined)
+key 85    ZENKAKU_HANKAKU
+key 86    BACKSLASH
+key 87    F11
+key 88    F12
+key 89    RO
+# key 90 "KEY_KATAKANA"
+# key 91 "KEY_HIRAGANA"
+key 92    HENKAN
+key 93    KATAKANA_HIRAGANA
+key 94    MUHENKAN
+key 95    NUMPAD_COMMA
+key 96    NUMPAD_ENTER
+key 97    CTRL_RIGHT
+key 98    NUMPAD_DIVIDE
+key 99    SYSRQ
+key 100   ALT_RIGHT
+# key 101 "KEY_LINEFEED"
+key 102   HOME
+key 103   DPAD_UP
+key 104   PAGE_UP
+key 105   DPAD_LEFT
+key 106   DPAD_RIGHT
+key 107   MOVE_END
+key 108   DPAD_DOWN
+key 109   PAGE_DOWN
+key 110   INSERT
+key 111   FORWARD_DEL
+# key 112 "KEY_MACRO"
+key 113   VOLUME_MUTE
+key 114   VOLUME_DOWN
+key 115   VOLUME_UP
+key 116   POWER
+key 117   NUMPAD_EQUALS
+# key 118 "KEY_KPPLUSMINUS"
+key 119   BREAK
+# key 120 (undefined)
+key 121   NUMPAD_COMMA
+key 122   KANA
+key 123   EISU
+key 124   YEN
+key 125   META_LEFT
+key 126   META_RIGHT
+key 127   MENU
+key 128   MEDIA_STOP
+# key 129 "KEY_AGAIN"
+# key 130 "KEY_PROPS"
+# key 131 "KEY_UNDO"
+# key 132 "KEY_FRONT"
+# key 133 "KEY_COPY"
+# key 134 "KEY_OPEN"
+# key 135 "KEY_PASTE"
+# key 136 "KEY_FIND"
+# key 137 "KEY_CUT"
+# key 138 "KEY_HELP"
+key 139   MENU              VIRTUAL
+key 140   CALCULATOR
+# key 141 "KEY_SETUP"
+key 142   SLEEP
+key 143   WAKEUP
+# key 144 "KEY_FILE"
+# key 145 "KEY_SENDFILE"
+# key 146 "KEY_DELETEFILE"
+# key 147 "KEY_XFER"
+# key 148 "KEY_PROG1"
+# key 149 "KEY_PROG2"
+key 150   EXPLORER
+# key 151 "KEY_MSDOS"
+key 152   POWER
+# key 153 "KEY_DIRECTION"
+# key 154 "KEY_CYCLEWINDOWS"
+key 155   ENVELOPE
+key 156   BOOKMARK
+# key 157 "KEY_COMPUTER"
+key 158   BACK              VIRTUAL
+key 159   FORWARD
+key 160   MEDIA_CLOSE
+key 161   MEDIA_EJECT
+key 162   MEDIA_EJECT
+key 163   MEDIA_NEXT
+key 164   MEDIA_PLAY_PAUSE
+key 165   MEDIA_PREVIOUS
+key 166   MEDIA_STOP
+key 167   MEDIA_RECORD
+key 168   MEDIA_REWIND
+key 169   CALL
+# key 170 "KEY_ISO"
+key 171   MUSIC
+key 172   HOME              VIRTUAL
+# key 173 "KEY_REFRESH"
+# key 174 "KEY_EXIT"
+# key 175 "KEY_MOVE"
+# key 176 "KEY_EDIT"
+key 177   PAGE_UP
+key 178   PAGE_DOWN
+key 179   NUMPAD_LEFT_PAREN
+key 180   NUMPAD_RIGHT_PAREN
+# key 181 "KEY_NEW"
+# key 182 "KEY_REDO"
+# key 183   F13
+# key 184   F14
+# key 185   F15
+# key 186   F16
+# key 187   F17
+# key 188   F18
+# key 189   F19
+# key 190   F20
+# key 191   F21
+# key 192   F22
+# key 193   F23
+# key 194   F24
+# key 195 (undefined)
+# key 196 (undefined)
+# key 197 (undefined)
+# key 198 (undefined)
+# key 199 (undefined)
+key 200   MEDIA_PLAY
+key 201   MEDIA_PAUSE
+# key 202 "KEY_PROG3"
+# key 203 "KEY_PROG4"
+# key 204 (undefined)
+# key 205 "KEY_SUSPEND"
+# key 206 "KEY_CLOSE"
+key 207   MEDIA_PLAY
+key 208   MEDIA_FAST_FORWARD
+# key 209 "KEY_BASSBOOST"
+# key 210 "KEY_PRINT"
+# key 211 "KEY_HP"
+key 212   CAMERA
+key 213   MUSIC
+# key 214 "KEY_QUESTION"
+key 215   ENVELOPE
+# key 216 "KEY_CHAT"
+key 217   SEARCH
+# key 218 "KEY_CONNECT"
+# key 219 "KEY_FINANCE"
+# key 220 "KEY_SPORT"
+# key 221 "KEY_SHOP"
+# key 222 "KEY_ALTERASE"
+# key 223 "KEY_CANCEL"
+key 224   BRIGHTNESS_DOWN
+key 225   BRIGHTNESS_UP
+key 226   HEADSETHOOK
+
+key 249	  CHANNEL_UP        VIRTUAL
+key 250   INFO
+
+key 256   BUTTON_1
+key 257   BUTTON_2
+key 258   BUTTON_3
+key 259   BUTTON_4
+key 260   BUTTON_5
+key 261   BUTTON_6
+key 262   BUTTON_7
+key 263   BUTTON_8
+key 264   BUTTON_9
+key 265   BUTTON_10
+key 266   BUTTON_11
+key 267   BUTTON_12
+key 268   BUTTON_13
+key 269   BUTTON_14
+key 270   BUTTON_15
+key 271   BUTTON_16
+
+key 288   BUTTON_1
+key 289   BUTTON_2
+key 290   BUTTON_3
+key 291   BUTTON_4
+key 292   BUTTON_5
+key 293   BUTTON_6
+key 294   BUTTON_7
+key 295   BUTTON_8
+key 296   BUTTON_9
+key 297   BUTTON_10
+key 298   BUTTON_11
+key 299   BUTTON_12
+key 300   BUTTON_13
+key 301   BUTTON_14
+key 302   BUTTON_15
+key 303   BUTTON_16
+
+
+key 304   BUTTON_A
+key 305   BUTTON_B
+key 306   BUTTON_C
+key 307   BUTTON_X
+key 308   BUTTON_Y
+key 309   BUTTON_Z
+key 310   BUTTON_L1
+key 311   BUTTON_R1
+key 312   BUTTON_L2
+key 313   BUTTON_R2
+key 314   BUTTON_SELECT
+key 315   BUTTON_START
+key 316   BUTTON_MODE
+key 317   BUTTON_THUMBL
+key 318   BUTTON_THUMBR
+
+
+# key 352 "KEY_OK"
+key 353   DPAD_CENTER
+# key 354 "KEY_GOTO"
+# key 355 "KEY_CLEAR"
+# key 356 "KEY_POWER2"
+# key 357 "KEY_OPTION"
+# key 358 "KEY_INFO"
+# key 359 "KEY_TIME"
+# key 360 "KEY_VENDOR"
+# key 361 "KEY_ARCHIVE"
+key 362   GUIDE
+# key 363 "KEY_CHANNEL"
+# key 364 "KEY_FAVORITES"
+# key 365 "KEY_EPG"
+key 366   DVR
+# key 367 "KEY_MHP"
+# key 368 "KEY_LANGUAGE"
+# key 369 "KEY_TITLE"
+# key 370 "KEY_SUBTITLE"
+# key 371 "KEY_ANGLE"
+# key 372 "KEY_ZOOM"
+# key 373 "KEY_MODE"
+# key 374 "KEY_KEYBOARD"
+# key 375 "KEY_SCREEN"
+# key 376 "KEY_PC"
+key 377   TV
+# key 378 "KEY_TV2"
+# key 379 "KEY_VCR"
+# key 380 "KEY_VCR2"
+# key 381 "KEY_SAT"
+# key 382 "KEY_SAT2"
+# key 383 "KEY_CD"
+# key 384 "KEY_TAPE"
+# key 385 "KEY_RADIO"
+# key 386 "KEY_TUNER"
+# key 387 "KEY_PLAYER"
+# key 388 "KEY_TEXT"
+# key 389 "KEY_DVD"
+# key 390 "KEY_AUX"
+# key 391 "KEY_MP3"
+# key 392 "KEY_AUDIO"
+# key 393 "KEY_VIDEO"
+# key 394 "KEY_DIRECTORY"
+# key 395 "KEY_LIST"
+# key 396 "KEY_MEMO"
+key 397   CALENDAR
+# key 398 "KEY_RED"
+# key 399 "KEY_GREEN"
+# key 400 "KEY_YELLOW"
+# key 401 "KEY_BLUE"
+key 402   CHANNEL_UP
+key 403   CHANNEL_DOWN
+# key 404 "KEY_FIRST"
+# key 405 "KEY_LAST"
+# key 406 "KEY_AB"
+# key 407 "KEY_NEXT"
+# key 408 "KEY_RESTART"
+# key 409 "KEY_SLOW"
+# key 410 "KEY_SHUFFLE"
+# key 411 "KEY_BREAK"
+# key 412 "KEY_PREVIOUS"
+# key 413 "KEY_DIGITS"
+# key 414 "KEY_TEEN"
+# key 415 "KEY_TWEN"
+
+key 429   CONTACTS
+
+# key 448 "KEY_DEL_EOL"
+# key 449 "KEY_DEL_EOS"
+# key 450 "KEY_INS_LINE"
+# key 451 "KEY_DEL_LINE"
+
+
+key 464   FUNCTION
+key 465   ESCAPE            FUNCTION
+key 466   F1                FUNCTION
+key 467   F2                FUNCTION
+key 468   F3                FUNCTION
+key 469   F4                FUNCTION
+key 470   F5                FUNCTION
+key 471   F6                FUNCTION
+key 472   F7                FUNCTION
+key 473   F8                FUNCTION
+key 474   F9                FUNCTION
+key 475   F10               FUNCTION
+key 476   F11               FUNCTION
+key 477   F12               FUNCTION
+key 478   1                 FUNCTION
+key 479   2                 FUNCTION
+key 480   D                 FUNCTION
+key 481   E                 FUNCTION
+key 482   F                 FUNCTION
+key 483   S                 FUNCTION
+key 484   B                 FUNCTION
+
+
+# key 497 KEY_BRL_DOT1
+# key 498 KEY_BRL_DOT2
+# key 499 KEY_BRL_DOT3
+# key 500 KEY_BRL_DOT4
+# key 501 KEY_BRL_DOT5
+# key 502 KEY_BRL_DOT6
+# key 503 KEY_BRL_DOT7
+# key 504 KEY_BRL_DOT8
+
+key 580   APP_SWITCH
+key 582   VOICE_ASSIST
+
+# Keys defined by HID usages
+key usage 0x0c006F BRIGHTNESS_UP
+key usage 0x0c0070 BRIGHTNESS_DOWN
+
+# Joystick and game controller axes.
+# Axes that are not mapped will be assigned generic axis numbers by the input subsystem.
+axis 0x00 X
+axis 0x01 Y
+axis 0x02 Z
+axis 0x03 RX
+axis 0x04 RY
+axis 0x05 RZ
+axis 0x06 THROTTLE
+axis 0x07 RUDDER
+axis 0x08 WHEEL
+axis 0x09 GAS
+axis 0x0a BRAKE
+axis 0x10 HAT_X
+axis 0x11 HAT_Y
+
+# LEDs
+led 0x00 NUM_LOCK
+led 0x01 CAPS_LOCK
+led 0x02 SCROLL_LOCK
+led 0x03 COMPOSE
+led 0x04 KANA
+led 0x05 SLEEP
+led 0x06 SUSPEND
+led 0x07 MUTE
+led 0x08 MISC
+led 0x09 MAIL
+led 0x0a CHARGING
diff --git a/prebuilt/usr/keylayout/Generic.kl b/prebuilt/usr/keylayout/Generic-D4x5.kl
old mode 100644
new mode 100755
similarity index 95%
rename from prebuilt/usr/keylayout/Generic.kl
rename to prebuilt/usr/keylayout/Generic-D4x5.kl
index 1413319..346fdd4
--- a/prebuilt/usr/keylayout/Generic.kl
+++ b/prebuilt/usr/keylayout/Generic-D4x5.kl
@@ -121,7 +121,7 @@ key 98    NUMPAD_DIVIDE
 key 99    SYSRQ
 key 100   ALT_RIGHT
 # key 101 "KEY_LINEFEED"
-key 102   MOVE_HOME
+key 102   HOME              VIRTUAL
 key 103   DPAD_UP
 key 104   PAGE_UP
 key 105   DPAD_LEFT
@@ -135,7 +135,7 @@ key 111   FORWARD_DEL
 key 113   VOLUME_MUTE
 key 114   VOLUME_DOWN
 key 115   VOLUME_UP
-key 116   POWER             WAKE
+key 116   POWER
 key 117   NUMPAD_EQUALS
 # key 118 "KEY_KPPLUSMINUS"
 key 119   BREAK
@@ -146,7 +146,7 @@ key 123   EISU
 key 124   YEN
 key 125   META_LEFT
 key 126   META_RIGHT
-key 127   MENU              WAKE_DROPPED
+key 127   MENU
 key 128   MEDIA_STOP
 # key 129 "KEY_AGAIN"
 # key 130 "KEY_PROPS"
@@ -158,11 +158,11 @@ key 128   MEDIA_STOP
 # key 136 "KEY_FIND"
 # key 137 "KEY_CUT"
 # key 138 "KEY_HELP"
-key 139   MENU              WAKE_DROPPED
+key 139   MENU
 key 140   CALCULATOR
 # key 141 "KEY_SETUP"
-key 142   POWER             WAKE
-key 143   POWER             WAKE
+key 142   SLEEP
+key 143   WAKEUP
 # key 144 "KEY_FILE"
 # key 145 "KEY_SENDFILE"
 # key 146 "KEY_DELETEFILE"
@@ -171,13 +171,13 @@ key 143   POWER             WAKE
 # key 149 "KEY_PROG2"
 key 150   EXPLORER
 # key 151 "KEY_MSDOS"
-key 152   POWER             WAKE
+key 152   POWER
 # key 153 "KEY_DIRECTION"
 # key 154 "KEY_CYCLEWINDOWS"
 key 155   ENVELOPE
 key 156   BOOKMARK
 # key 157 "KEY_COMPUTER"
-key 158   BACK              WAKE_DROPPED
+key 158   BACK              VIRTUAL
 key 159   FORWARD
 key 160   MEDIA_CLOSE
 key 161   MEDIA_EJECT
@@ -191,7 +191,7 @@ key 168   MEDIA_REWIND
 key 169   CALL
 # key 170 "KEY_ISO"
 key 171   MUSIC
-key 172   HOME
+key 172   MENU              VIRTUAL
 # key 173 "KEY_REFRESH"
 # key 174 "KEY_EXIT"
 # key 175 "KEY_MOVE"
@@ -247,6 +247,8 @@ key 224   BRIGHTNESS_DOWN
 key 225   BRIGHTNESS_UP
 key 226   HEADSETHOOK
 
+key 250   INFO
+
 key 256   BUTTON_1
 key 257   BUTTON_2
 key 258   BUTTON_3
@@ -404,6 +406,9 @@ key 484   B                 FUNCTION
 # key 503 KEY_BRL_DOT7
 # key 504 KEY_BRL_DOT8
 
+key 580   APP_SWITCH
+key 582   VOICE_ASSIST
+
 # Keys defined by HID usages
 key usage 0x0c006F BRIGHTNESS_UP
 key usage 0x0c0070 BRIGHTNESS_DOWN
@@ -423,3 +428,16 @@ axis 0x09 GAS
 axis 0x0a BRAKE
 axis 0x10 HAT_X
 axis 0x11 HAT_Y
+
+# LEDs
+led 0x00 NUM_LOCK
+led 0x01 CAPS_LOCK
+led 0x02 SCROLL_LOCK
+led 0x03 COMPOSE
+led 0x04 KANA
+led 0x05 SLEEP
+led 0x06 SUSPEND
+led 0x07 MUTE
+led 0x08 MISC
+led 0x09 MAIL
+led 0x0a CHARGING
diff --git a/prebuilt/usr/keylayout/Vendor_0079_Product_0011.kl b/prebuilt/usr/keylayout/Vendor_0079_Product_0011.kl
deleted file mode 100644
index 2ae2a01..0000000
--- a/prebuilt/usr/keylayout/Vendor_0079_Product_0011.kl
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (C) 2013 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Classic NES Controller
-
-key 289 BUTTON_A
-key 290 BUTTON_B
-key 297 BUTTON_START
-key 296 BUTTON_SELECT
-
-axis 0x00 HAT_X
-axis 0x01 HAT_Y
diff --git a/prebuilt/usr/keylayout/Vendor_045e_Product_028e.kl b/prebuilt/usr/keylayout/Vendor_045e_Product_028e.kl
deleted file mode 100644
index 301601a..0000000
--- a/prebuilt/usr/keylayout/Vendor_045e_Product_028e.kl
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright (C) 2011 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# XBox 360 USB Controller
-#
-
-key 304   BUTTON_A
-key 305   BUTTON_B
-key 307   BUTTON_X
-key 308   BUTTON_Y
-key 310   BUTTON_L1
-key 311   BUTTON_R1
-key 314   BACK
-key 315   BUTTON_START
-key 316   HOME
-key 317   BUTTON_THUMBL
-key 318   BUTTON_THUMBR
-
-# Left and right stick.
-# The reported value for flat is 128 out of a range from -32767 to 32768, which is absurd.
-# This confuses applications that rely on the flat value because the joystick actually
-# settles in a flat range of +/- 4096 or so.
-axis 0x00 X flat 4096
-axis 0x01 Y flat 4096
-axis 0x03 Z flat 4096
-axis 0x04 RZ flat 4096
-
-# Triggers.
-axis 0x02 LTRIGGER
-axis 0x05 RTRIGGER
-
-# Hat.
-axis 0x10 HAT_X
-axis 0x11 HAT_Y
diff --git a/prebuilt/usr/keylayout/Vendor_046d_Product_c216.kl b/prebuilt/usr/keylayout/Vendor_046d_Product_c216.kl
deleted file mode 100644
index 6743323..0000000
--- a/prebuilt/usr/keylayout/Vendor_046d_Product_c216.kl
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (C) 2011 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Logitech Dual Action Controller
-#
-
-key 0x120    BUTTON_A
-key 0x123    BUTTON_B
-key 0x121    BUTTON_X
-key 0x122    BUTTON_Y
-key 0x124    BUTTON_L1
-key 0x125    BUTTON_R1
-key 0x126    BUTTON_L2
-key 0x127    BUTTON_R2
-key 0x128    BUTTON_SELECT
-key 0x129    BUTTON_START
-key 0x12a    BUTTON_THUMBL
-key 0x12b    BUTTON_THUMBR
-
-axis 0x00    X
-axis 0x01    Y
-axis 0x02    Z
-axis 0x05    RZ
-axis 0x10    HAT_X
-axis 0x11    HAT_Y
diff --git a/prebuilt/usr/keylayout/Vendor_046d_Product_c219.kl b/prebuilt/usr/keylayout/Vendor_046d_Product_c219.kl
deleted file mode 100644
index 2fa964c..0000000
--- a/prebuilt/usr/keylayout/Vendor_046d_Product_c219.kl
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (C) 2013 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Logitech Logitech Cordless RumblePad 2
-
-key 305 BUTTON_A
-key 306 BUTTON_B
-key 304 BUTTON_X
-key 307 BUTTON_Y
-key 308 BUTTON_L1
-key 309 BUTTON_R1
-key 310 BUTTON_L2
-key 311 BUTTON_R2
-key 313 BUTTON_START
-key 312 BACK
-key 314 BUTTON_THUMBL
-key 315 BUTTON_THUMBR
-
-axis 0x00 X
-axis 0x01 Y
-axis 0x02 Z
-axis 0x05 RZ
-axis 0x10 HAT_X
-axis 0x11 HAT_Y
diff --git a/prebuilt/usr/keylayout/Vendor_046d_Product_c21f.kl b/prebuilt/usr/keylayout/Vendor_046d_Product_c21f.kl
deleted file mode 100644
index a9ba378..0000000
--- a/prebuilt/usr/keylayout/Vendor_046d_Product_c21f.kl
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (C) 2013 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Logitech Wireless Gamepad F710
-
-key 304 BUTTON_A
-key 305 BUTTON_B
-key 307 BUTTON_X
-key 308 BUTTON_Y
-key 310 BUTTON_L1
-key 311 BUTTON_R1
-key 315 BUTTON_START
-key 314 BACK
-key 316 HOME
-key 317 BUTTON_THUMBL
-key 318 BUTTON_THUMBR
-
-axis 0x00 X
-axis 0x01 Y
-axis 0x03 Z
-axis 0x04 RZ
-axis 0x05 RTRIGGER
-axis 0x02 LTRIGGER
-axis 0x10 HAT_X
-axis 0x11 HAT_Y
diff --git a/prebuilt/usr/keylayout/Vendor_046d_Product_c294.kl b/prebuilt/usr/keylayout/Vendor_046d_Product_c294.kl
deleted file mode 100644
index 5492f49..0000000
--- a/prebuilt/usr/keylayout/Vendor_046d_Product_c294.kl
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright (C) 2011 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Logitech G25 Racing Wheel (in Compatibility Mode)
-#
-
-# 4 way buttons above hat
-key 0x121    BUTTON_A
-key 0x123    BUTTON_B
-key 0x120    BUTTON_X
-key 0x122    BUTTON_Y
-
-# Row of buttons under hat
-key 0x12b    BUTTON_1
-key 0x128    BUTTON_2
-key 0x129    BUTTON_3
-key 0x12a    BUTTON_4
-
-# Gear shift positions
-#   0x12a top-left gear (aliased as BUTTON_4)
-#   0x12b bottom-left gear (aliased as BUTTON_1)
-
-# Buttons on wheel
-key 0x127    BUTTON_L1
-key 0x126    BUTTON_R1
-
-# Toggles under wheel
-key 0x125    BUTTON_L2
-key 0x124    BUTTON_R2
-
-# Hat
-axis 0x10    HAT_X
-axis 0x11    HAT_Y
-
-# Steering Wheel
-axis 0x00    WHEEL
-
-# Accelerator / Brake
-#   00..7e : accelerator
-#   80..ff : brake
-axis 0x01    split 0x7f GAS BRAKE
diff --git a/prebuilt/usr/keylayout/Vendor_046d_Product_c299.kl b/prebuilt/usr/keylayout/Vendor_046d_Product_c299.kl
deleted file mode 100644
index d42963d..0000000
--- a/prebuilt/usr/keylayout/Vendor_046d_Product_c299.kl
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright (C) 2011 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Logitech G25 Racing Wheel (in Native Mode)
-#
-
-# 4 way buttons above hat
-key 0x121    BUTTON_A
-key 0x123    BUTTON_B
-key 0x120    BUTTON_X
-key 0x122    BUTTON_Y
-
-# Row of buttons under hat
-key 0x12b    BUTTON_1
-key 0x128    BUTTON_2
-key 0x129    BUTTON_3
-key 0x12a    BUTTON_4
-
-# Gear shift positions
-key 0x12c    BUTTON_5
-key 0x12d    BUTTON_6
-key 0x12e    BUTTON_7
-key 0x12f    BUTTON_8
-key 0x2d0    BUTTON_9
-key 0x2d1    BUTTON_10
-key 0x2d2    BUTTON_11
-
-# Buttons on wheel
-key 0x127    BUTTON_L1
-key 0x126    BUTTON_R1
-
-# Toggles under wheel
-key 0x125    BUTTON_L2
-key 0x124    BUTTON_R2
-
-# Hat
-axis 0x10    HAT_X
-axis 0x11    HAT_Y
-
-# Steering Wheel
-axis 0x00    WHEEL
-
-# Clutch
-axis 0x01    invert GENERIC_1
-
-# Accelerator
-axis 0x02    invert GAS
-
-# Brake
-axis 0x05    invert BRAKE
diff --git a/prebuilt/usr/keylayout/Vendor_046d_Product_c532.kl b/prebuilt/usr/keylayout/Vendor_046d_Product_c532.kl
deleted file mode 100644
index 741c2e1..0000000
--- a/prebuilt/usr/keylayout/Vendor_046d_Product_c532.kl
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright (C) 2010 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Logitech Revue Wireless keyboard
-#
-# Notes:
-# - The GRAVE key is emulated by the keyboard.
-#     ALT + LEFT_BRACKET produces GRAVE.
-#     ALT + RIGHT_BRACKET produces SHIFT + GRAVE.
-# - FORWARD_DEL is produced by fn + BACKSPACE
-# - PAGE_UP / PAGE_DOWN is produced by fn + CHANNEL_UP / CHANNEL_DOWN
-# - The AVR / STB / TV power and input buttons seem to be non-functional
-#   as well as several of the other fn buttons and the PIP button?
-
-key 1     ESCAPE
-key 2     1
-key 3     2
-key 4     3
-key 5     4
-key 6     5
-key 7     6
-key 8     7
-key 9     8
-key 10    9
-key 11    0
-key 12    MINUS
-key 13    EQUALS
-key 14    DEL
-key 15    TAB
-key 16    Q
-key 17    W
-key 18    E
-key 19    R
-key 20    T
-key 21    Y
-key 22    U
-key 23    I
-key 24    O
-key 25    P
-key 26    LEFT_BRACKET
-key 27    RIGHT_BRACKET
-key 28    ENTER
-key 29    CTRL_LEFT
-key 30    A
-key 31    S
-key 32    D
-key 33    F
-key 34    G
-key 35    H
-key 36    J
-key 37    K
-key 38    L
-key 39    SEMICOLON
-key 40    APOSTROPHE
-key 41    GRAVE
-key 42    SHIFT_LEFT
-key 43    BACKSLASH
-key 44    Z
-key 45    X
-key 46    C
-key 47    V
-key 48    B
-key 49    N
-key 50    M
-key 51    COMMA
-key 52    PERIOD
-key 53    SLASH
-key 54    SHIFT_RIGHT
-key 56    ALT_RIGHT
-key 57    SPACE
-key 58    CAPS_LOCK
-key 59    F1
-key 60    F2
-key 61    F3
-key 62    F4
-key 63    F5
-key 64    F6
-key 65    F7
-key 66    F8
-key 67    F9
-key 68    F10
-key 87    F11
-key 88    F12
-key 96    DPAD_CENTER
-key 97    CTRL_RIGHT
-key 102   MOVE_HOME
-key 103   DPAD_UP
-key 104   PAGE_UP
-key 105   DPAD_LEFT
-key 106   DPAD_RIGHT
-key 107   MOVE_END
-key 108   DPAD_DOWN
-key 109   PAGE_DOWN
-key 110   NUMPAD_ENTER
-key 111   FORWARD_DEL
-key 113   VOLUME_MUTE
-key 114   VOLUME_DOWN
-key 115   VOLUME_UP
-key 119   MEDIA_PAUSE
-key 125   SEARCH
-key 127   MENU
-key 156   BOOKMARK
-key 158   BACK
-key 163   MEDIA_NEXT
-key 165   MEDIA_PREVIOUS
-key 166   MEDIA_STOP
-key 167   MEDIA_RECORD
-key 168   MEDIA_REWIND
-key 172   HOME
-key 207   MEDIA_PLAY
-key 208   MEDIA_FAST_FORWARD
-# key 288  left mouse button
-# key 289  right mouse button (fn + button)
-key 362   GUIDE
-key 366   DVR
-key 377   TV
-key 402   CHANNEL_UP
-key 403   CHANNEL_DOWN
-key 418   ZOOM_IN
-key 419   ZOOM_OUT
-
diff --git a/prebuilt/usr/keylayout/Vendor_054c_Product_0268.kl b/prebuilt/usr/keylayout/Vendor_054c_Product_0268.kl
deleted file mode 100644
index 7c60137..0000000
--- a/prebuilt/usr/keylayout/Vendor_054c_Product_0268.kl
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright (C) 2011 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Sony Playstation(R)3 Controller
-#
-
-key 0x124    DPAD_UP
-key 0x125    DPAD_RIGHT
-key 0x126    DPAD_DOWN
-key 0x127    DPAD_LEFT
-
-key 0x120    BUTTON_SELECT
-key 0x123    BUTTON_START
-key 0x12e    BUTTON_A
-key 0x12d    BUTTON_B
-key 0x12f    BUTTON_X
-key 0x12c    BUTTON_Y
-key 0x12a    BUTTON_L1
-key 0x12b    BUTTON_R1
-key 0x128    BUTTON_L2
-key 0x129    BUTTON_R2
-key 0x121    BUTTON_THUMBL
-key 0x122    BUTTON_THUMBR
-
-# PS key
-key 0x2d0    HOME
-
-# Left Analog Stick
-axis 0x00    X
-axis 0x01    Y
-
-# Right Analog Stick
-axis 0x02    Z
-axis 0x05    RZ
-
-# DPAD
-# axis 0x2c   -HAT_Y
-# axis 0x2d   +HAT_X
-# axis 0x2e   +HAT_Y
-# axis 0x2f   -HAT_X
-
-# L2 trigger
-axis 0x30   LTRIGGER
-
-# R2 trigger
-axis 0x31   RTRIGGER
-
-# L1 trigger
-# axis 0x32
-
-# R1 trigger
-# axis 0x33
-
-# Triangle
-# axis 0x34
-
-# Circle
-# axis 0x35
-
-# Cross
-# axis 0x36
-
-# Square
-# axis 0x37
diff --git a/prebuilt/usr/keylayout/Vendor_0583_Product_2060.kl b/prebuilt/usr/keylayout/Vendor_0583_Product_2060.kl
deleted file mode 100644
index 92c8a14..0000000
--- a/prebuilt/usr/keylayout/Vendor_0583_Product_2060.kl
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (C) 2013 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# ION GO PAD
-
-key 288 BUTTON_A
-key 289 BUTTON_B
-key 290 BUTTON_X
-key 291 BUTTON_Y
-key 294 BUTTON_L1
-key 295 BUTTON_R1
-key 292 BUTTON_L2
-key 293 BUTTON_R2
-
-axis 0x00 HAT_X
-axis 0x01 HAT_Y
diff --git a/prebuilt/usr/keylayout/Vendor_05ac_Product_0239.kl b/prebuilt/usr/keylayout/Vendor_05ac_Product_0239.kl
deleted file mode 100644
index b0c358e..0000000
--- a/prebuilt/usr/keylayout/Vendor_05ac_Product_0239.kl
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright (C) 2010 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Apple Wireless Keyboard
-#
-# Notes:
-# - Keys such as PAGE_UP and FORWARD_DEL are produced using the
-#   function key.
-# - Special function keys for brightness control, etc. are not
-#   implemented here.
-
-key 1     ESCAPE
-key 2     1
-key 3     2
-key 4     3
-key 5     4
-key 6     5
-key 7     6
-key 8     7
-key 9     8
-key 10    9
-key 11    0
-key 12    MINUS
-key 13    EQUALS
-key 14    DEL
-key 15    TAB
-key 16    Q
-key 17    W
-key 18    E
-key 19    R
-key 20    T
-key 21    Y
-key 22    U
-key 23    I
-key 24    O
-key 25    P
-key 26    LEFT_BRACKET
-key 27    RIGHT_BRACKET
-key 28    ENTER
-key 29    CTRL_LEFT
-key 30    A
-key 31    S
-key 32    D
-key 33    F
-key 34    G
-key 35    H
-key 36    J
-key 37    K
-key 38    L
-key 39    SEMICOLON
-key 40    APOSTROPHE
-key 41    GRAVE
-key 42    SHIFT_LEFT
-key 43    BACKSLASH
-key 44    Z
-key 45    X
-key 46    C
-key 47    V
-key 48    B
-key 49    N
-key 50    M
-key 51    COMMA
-key 52    PERIOD
-key 53    SLASH
-key 54    SHIFT_RIGHT
-key 56    ALT_LEFT
-key 57    SPACE
-key 58    CAPS_LOCK
-key 59    F1
-key 60    F2
-key 61    F3
-key 62    F4
-key 63    F5
-key 64    F6
-key 65    F7
-key 66    F8
-key 67    F9
-key 68    F10
-key 87    F11
-key 88    F12
-key 100   ALT_RIGHT
-key 102   MOVE_HOME
-key 103   DPAD_UP
-key 104   PAGE_UP
-key 105   DPAD_LEFT
-key 106   DPAD_RIGHT
-key 107   MOVE_END
-key 108   DPAD_DOWN
-key 109   PAGE_DOWN
-key 110   NUMPAD_ENTER
-key 111   FORWARD_DEL
-key 113   VOLUME_MUTE
-key 114   VOLUME_DOWN
-key 115   VOLUME_UP
-key 120   APP_SWITCH
-key 125   META_LEFT
-key 126   META_RIGHT
-key 161   MEDIA_EJECT
-key 163   MEDIA_NEXT
-key 164   MEDIA_PLAY_PAUSE
-key 165   MEDIA_PREVIOUS
-# key 204  show gadgets
-key 224   BRIGHTNESS_DOWN
-key 225   BRIGHTNESS_UP
-# key 229  blank special function on F5
-# key 230  blank special function on F6
-key 464   FUNCTION
diff --git a/prebuilt/usr/keylayout/Vendor_1038_Product_1412.kl b/prebuilt/usr/keylayout/Vendor_1038_Product_1412.kl
deleted file mode 100644
index 551b0bd..0000000
--- a/prebuilt/usr/keylayout/Vendor_1038_Product_1412.kl
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (C) 2013 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Steelseries Free
-
-key 304 BUTTON_A
-key 305 BUTTON_B
-key 307 BUTTON_X
-key 308 BUTTON_Y
-key 310 BUTTON_L1
-key 311 BUTTON_R1
-key 315 BUTTON_START
-key 316 BUTTON_SELECT
-
-axis 0x00 X
-axis 0x01 Y
-axis 0x02 Z
-axis 0x05 RZ
-axis 0x10 HAT_X
-axis 0x11 HAT_Y
diff --git a/prebuilt/usr/keylayout/Vendor_12bd_Product_d015.kl b/prebuilt/usr/keylayout/Vendor_12bd_Product_d015.kl
deleted file mode 100644
index 557d62f..0000000
--- a/prebuilt/usr/keylayout/Vendor_12bd_Product_d015.kl
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (C) 2013 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Hitgaming SNES Retro
-
-key 306 BUTTON_A
-key 305 BUTTON_B
-key 307 BUTTON_X
-key 304 BUTTON_Y
-key 308 BUTTON_L1
-key 309 BUTTON_R1
-key 313 BUTTON_START
-key 312 BUTTON_SELECT
-
-axis 0x00 HAT_X
-axis 0x01 HAT_Y
diff --git a/prebuilt/usr/keylayout/Vendor_1689_Product_fd00.kl b/prebuilt/usr/keylayout/Vendor_1689_Product_fd00.kl
deleted file mode 100644
index 8407b13..0000000
--- a/prebuilt/usr/keylayout/Vendor_1689_Product_fd00.kl
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (C) 2013 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Razer Onza Tournament Edition
-
-key 304 BUTTON_A
-key 305 BUTTON_B
-key 307 BUTTON_X
-key 308 BUTTON_Y
-key 310 BUTTON_L1
-key 311 BUTTON_R1
-key 315 BUTTON_START
-key 314 BACK
-key 316 HOME
-key 317 BUTTON_THUMBL
-key 318 BUTTON_THUMBR
-key 706 DPAD_UP
-key 705 DPAD_RIGHT
-key 707 DPAD_DOWN
-key 704 DPAD_LEFT
-
-axis 0x00 X
-axis 0x01 Y
-axis 0x03 Z
-axis 0x04 RZ
-axis 0x05 RTRIGGER
-axis 0x02 LTRIGGER
diff --git a/prebuilt/usr/keylayout/Vendor_1689_Product_fd01.kl b/prebuilt/usr/keylayout/Vendor_1689_Product_fd01.kl
deleted file mode 100644
index cacc075..0000000
--- a/prebuilt/usr/keylayout/Vendor_1689_Product_fd01.kl
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (C) 2013 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Razer Xbox 360 Gamepad
-
-key 304 BUTTON_A
-key 305 BUTTON_B
-key 307 BUTTON_X
-key 308 BUTTON_Y
-key 310 BUTTON_L1
-key 311 BUTTON_R1
-key 315 BUTTON_START
-key 314 BACK
-key 316 HOME
-key 317 BUTTON_THUMBL
-key 318 BUTTON_THUMBR
-
-axis 0x00 X
-axis 0x01 Y
-axis 0x03 Z
-axis 0x04 RZ
-axis 0x05 RTRIGGER
-axis 0x02 LTRIGGER
-axis 0x10 HAT_X
-axis 0x11 HAT_Y
diff --git a/prebuilt/usr/keylayout/Vendor_1689_Product_fe00.kl b/prebuilt/usr/keylayout/Vendor_1689_Product_fe00.kl
deleted file mode 100644
index 467173f..0000000
--- a/prebuilt/usr/keylayout/Vendor_1689_Product_fe00.kl
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (C) 2013 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Razer Sabertooth Elite
-
-key 304 BUTTON_A
-key 305 BUTTON_B
-key 307 BUTTON_X
-key 308 BUTTON_Y
-key 310 BUTTON_L1
-key 311 BUTTON_R1
-key 315 BUTTON_START
-key 314 BACK
-key 316 HOME
-key 317 BUTTON_THUMBL
-key 318 BUTTON_THUMBR
-
-axis 0x00 X
-axis 0x01 Y
-axis 0x03 Z
-axis 0x04 RZ
-axis 0x05 RTRIGGER
-axis 0x02 LTRIGGER
-axis 0x10 HAT_X
-axis 0x11 HAT_Y
diff --git a/prebuilt/usr/keylayout/Vendor_1bad_Product_f016.kl b/prebuilt/usr/keylayout/Vendor_1bad_Product_f016.kl
deleted file mode 100644
index 00f8559..0000000
--- a/prebuilt/usr/keylayout/Vendor_1bad_Product_f016.kl
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (C) 2013 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Madcatz Gamepad
-
-key 304 BUTTON_A
-key 305 BUTTON_B
-key 307 BUTTON_X
-key 308 BUTTON_Y
-key 310 BUTTON_L1
-key 311 BUTTON_R1
-key 315 BUTTON_START
-key 314 BACK
-key 316 HOME
-key 317 BUTTON_THUMBL
-key 318 BUTTON_THUMBR
-
-axis 0x00 X
-axis 0x01 Y
-axis 0x03 Z
-axis 0x04 RZ
-axis 0x05 RTRIGGER
-axis 0x02 LTRIGGER
-axis 0x10 HAT_X
-axis 0x11 HAT_Y
diff --git a/prebuilt/usr/keylayout/Vendor_1bad_Product_f023.kl b/prebuilt/usr/keylayout/Vendor_1bad_Product_f023.kl
deleted file mode 100644
index 175a523..0000000
--- a/prebuilt/usr/keylayout/Vendor_1bad_Product_f023.kl
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (C) 2013 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Mad Catz MLG GamePad for Xbox 360
-
-key 304 BUTTON_A
-key 305 BUTTON_B
-key 307 BUTTON_X
-key 308 BUTTON_Y
-key 310 BUTTON_L1
-key 311 BUTTON_R1
-key 315 BUTTON_START
-key 314 BACK
-key 317 BUTTON_THUMBL
-key 318 BUTTON_THUMBR
-
-axis 0x00 X
-axis 0x01 Y
-axis 0x03 Z
-axis 0x04 RZ
-axis 0x05 RTRIGGER
-axis 0x02 LTRIGGER
-axis 0x10 HAT_X
-axis 0x11 HAT_Y
diff --git a/prebuilt/usr/keylayout/Vendor_1bad_Product_f027.kl b/prebuilt/usr/keylayout/Vendor_1bad_Product_f027.kl
deleted file mode 100644
index 216e3da..0000000
--- a/prebuilt/usr/keylayout/Vendor_1bad_Product_f027.kl
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (C) 2013 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# MadCatz FPS Pro
-
-key 304 BUTTON_A
-key 305 BUTTON_B
-key 307 BUTTON_X
-key 308 BUTTON_Y
-key 310 BUTTON_L1
-key 311 BUTTON_R1
-key 315 BUTTON_START
-key 314 BACK
-key 316 HOME
-key 317 BUTTON_THUMBL
-key 318 BUTTON_THUMBR
-
-axis 0x00 X
-axis 0x01 Y
-axis 0x03 Z
-axis 0x04 RZ
-axis 0x05 RTRIGGER
-axis 0x02 LTRIGGER
-axis 0x10 HAT_X
-axis 0x11 HAT_Y
diff --git a/prebuilt/usr/keylayout/Vendor_1bad_Product_f036.kl b/prebuilt/usr/keylayout/Vendor_1bad_Product_f036.kl
deleted file mode 100644
index f27de1c..0000000
--- a/prebuilt/usr/keylayout/Vendor_1bad_Product_f036.kl
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (C) 2013 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# MadCatz Generic XBox Controller
-
-key 304 BUTTON_A
-key 305 BUTTON_B
-key 307 BUTTON_X
-key 308 BUTTON_Y
-key 310 BUTTON_L1
-key 311 BUTTON_R1
-key 315 BUTTON_START
-key 314 BACK
-key 316 HOME
-key 317 BUTTON_THUMBL
-key 318 BUTTON_THUMBR
-
-axis 0x00 X
-axis 0x01 Y
-axis 0x03 Z
-axis 0x04 RZ
-axis 0x05 RTRIGGER
-axis 0x02 LTRIGGER
-axis 0x10 HAT_X
-axis 0x11 HAT_Y
diff --git a/prebuilt/usr/keylayout/Vendor_1d79_Product_0009.kl b/prebuilt/usr/keylayout/Vendor_1d79_Product_0009.kl
deleted file mode 100644
index a3d5bbd..0000000
--- a/prebuilt/usr/keylayout/Vendor_1d79_Product_0009.kl
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (C) 2013 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Nyko Playpad / Playpad Pro
-
-key 304 BUTTON_A
-key 305 BUTTON_B
-key 307 BUTTON_X
-key 308 BUTTON_Y
-key 310 BUTTON_L1
-key 311 BUTTON_R1
-key 315 BUTTON_START
-key 158 BACK
-key 172 HOME
-key 317 BUTTON_THUMBL
-key 318 BUTTON_THUMBR
-key 103 DPAD_UP
-key 105 DPAD_LEFT
-key 106 DPAD_RIGHT
-key 108 DPAD_DOWN
-
-axis 0x00 X
-axis 0x01 Y
-axis 0x02 Z
-axis 0x05 RZ
-axis 0x09 RTRIGGER
-axis 0x0a LTRIGGER
-axis 0x10 HAT_X
-axis 0x11 HAT_Y
diff --git a/prebuilt/usr/keylayout/Vendor_22b8_Product_093d.kl b/prebuilt/usr/keylayout/Vendor_22b8_Product_093d.kl
deleted file mode 100644
index 2749c5b..0000000
--- a/prebuilt/usr/keylayout/Vendor_22b8_Product_093d.kl
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright (C) 2010 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Motorola Bluetooth Wireless Keyboard.
-#
-
-key 1     BACK
-key 2     1
-key 3     2
-key 4     3
-key 5     4
-key 6     5
-key 7     6
-key 8     7
-key 9     8
-key 10    9
-key 11    0
-key 12    MINUS
-key 13    EQUALS
-key 14    DEL
-key 15    TAB
-key 16    Q
-key 17    W
-key 18    E
-key 19    R
-key 20    T
-key 21    Y
-key 22    U
-key 23    I
-key 24    O
-key 25    P
-key 26    LEFT_BRACKET
-key 27    RIGHT_BRACKET
-key 28    ENTER
-key 29    CTRL_LEFT
-key 30    A
-key 31    S
-key 32    D
-key 33    F
-key 34    G
-key 35    H
-key 36    J
-key 37    K
-key 38    L
-key 39    SEMICOLON
-key 40    APOSTROPHE
-key 41    GRAVE
-key 42    SHIFT_LEFT
-key 43    BACKSLASH
-key 44    Z
-key 45    X
-key 46    C
-key 47    V
-key 48    B
-key 49    N
-key 50    M
-key 51    COMMA
-key 52    PERIOD
-key 53    SLASH
-key 54    SHIFT_RIGHT
-key 56    ALT_LEFT
-key 57    SPACE
-key 58    CAPS_LOCK
-key 59    F1
-key 60    F2
-key 61    F3
-key 62    F4
-key 63    F5
-key 64    F6
-key 65    F7
-key 66    F8
-key 67    F9
-key 68    F10
-key 87    F11
-key 88    F12
-key 97    CTRL_RIGHT
-key 102   HOME
-key 103   DPAD_UP
-key 105   DPAD_LEFT
-key 106   DPAD_RIGHT
-key 107   MOVE_END
-key 108   DPAD_DOWN
-key 111   FORWARD_DEL
-key 113   VOLUME_MUTE
-key 114   VOLUME_DOWN
-key 115   VOLUME_UP
-key 125   MENU
-key 127   SEARCH
-key 163   MEDIA_NEXT
-key 164   MEDIA_PLAY_PAUSE
-key 165   MEDIA_PREVIOUS
-key 166   MEDIA_STOP
-# key 226  tbd reserved key
diff --git a/prebuilt/usr/keylayout/Vendor_2378_Product_100a.kl b/prebuilt/usr/keylayout/Vendor_2378_Product_100a.kl
deleted file mode 100644
index d9cd171..0000000
--- a/prebuilt/usr/keylayout/Vendor_2378_Product_100a.kl
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (C) 2013 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# OnLive, Inc. OnLive Wireless Controller
-
-key 304 BUTTON_A
-key 305 BUTTON_B
-key 307 BUTTON_X
-key 308 BUTTON_Y
-key 310 BUTTON_L1
-key 311 BUTTON_R1
-key 315 BUTTON_START
-key 314 BUTTON_SELECT
-key 317 BUTTON_THUMBL
-key 318 BUTTON_THUMBR
-
-axis 0x00 X
-axis 0x01 Y
-axis 0x03 Z
-axis 0x04 RZ
-axis 0x05 RTRIGGER
-axis 0x02 LTRIGGER
-axis 0x10 HAT_X
-axis 0x11 HAT_Y
diff --git a/prebuilt/usr/keylayout/gpio-keys_d410.kl b/prebuilt/usr/keylayout/gpio-keys_d410.kl
deleted file mode 100644
index 0cb57a5..0000000
--- a/prebuilt/usr/keylayout/gpio-keys_d410.kl
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (c) 2012, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-#       copyright notice, this list of conditions and the following
-#       disclaimer in the documentation and/or other materials provided
-#       with the distribution.
-#     * Neither the name of The Linux Foundation nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-
-key	115	VOLUME_UP		WAKE_DROPPED
-key	114	VOLUME_DOWN		WAKE
-key	102	HOME			WAKE
-key	250	INFO
-
-key	158	BACK			VIRTUAL
-key	172	HOME			VIRTUAL
-key	139	MENU			VIRTUAL
-key	249	CHANNEL_UP		VIRTUAL
diff --git a/prebuilt/usr/keylayout/gpio-keys_d415.kl b/prebuilt/usr/keylayout/gpio-keys_d415.kl
deleted file mode 100644
index 633eda6..0000000
--- a/prebuilt/usr/keylayout/gpio-keys_d415.kl
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (c) 2012, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-#       copyright notice, this list of conditions and the following
-#       disclaimer in the documentation and/or other materials provided
-#       with the distribution.
-#     * Neither the name of The Linux Foundation nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-
-key	115	VOLUME_UP		WAKE_DROPPED
-key	114	VOLUME_DOWN		WAKE
-key	102	HOME			WAKE
-key	250	INFO
-
-key	158	BACK			VIRTUAL
-key	172	MENU			VIRTUAL
diff --git a/prebuilt/usr/keylayout/qwerty.kl b/prebuilt/usr/keylayout/qwerty.kl
deleted file mode 100644
index f1caacd..0000000
--- a/prebuilt/usr/keylayout/qwerty.kl
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright (C) 2010 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Emulator keyboard layout #1.
-#
-# This file is no longer used as the platform's default keyboard layout.
-# Refer to Generic.kl instead.
-#
-
-key 399   GRAVE
-key 2     1
-key 3     2
-key 4     3
-key 5     4
-key 6     5
-key 7     6
-key 8     7
-key 9     8
-key 10    9
-key 11    0
-key 158   BACK              WAKE_DROPPED
-key 230   SOFT_RIGHT        WAKE
-key 60    SOFT_RIGHT        WAKE
-key 107   ENDCALL           WAKE_DROPPED
-key 62    ENDCALL           WAKE_DROPPED
-key 229   MENU              WAKE_DROPPED
-key 139   MENU              WAKE_DROPPED
-key 59    MENU              WAKE_DROPPED
-key 127   SEARCH            WAKE_DROPPED
-key 217   SEARCH            WAKE_DROPPED
-key 228   POUND
-key 227   STAR
-key 231   CALL              WAKE_DROPPED
-key 61    CALL              WAKE_DROPPED
-key 232   DPAD_CENTER       WAKE_DROPPED
-key 108   DPAD_DOWN         WAKE_DROPPED
-key 103   DPAD_UP           WAKE_DROPPED
-key 102   HOME              WAKE
-key 105   DPAD_LEFT         WAKE_DROPPED
-key 106   DPAD_RIGHT        WAKE_DROPPED
-key 115   VOLUME_UP         WAKE
-key 114   VOLUME_DOWN       WAKE
-key 116   POWER             WAKE
-key 212   CAMERA
-
-key 16    Q
-key 17    W
-key 18    E
-key 19    R
-key 20    T
-key 21    Y
-key 22    U
-key 23    I
-key 24    O
-key 25    P
-key 26    LEFT_BRACKET
-key 27    RIGHT_BRACKET
-key 43    BACKSLASH
-
-key 30    A
-key 31    S
-key 32    D
-key 33    F
-key 34    G
-key 35    H
-key 36    J
-key 37    K
-key 38    L
-key 39    SEMICOLON
-key 40    APOSTROPHE
-key 14    DEL
-        
-key 44    Z
-key 45    X
-key 46    C
-key 47    V
-key 48    B
-key 49    N
-key 50    M
-key 51    COMMA
-key 52    PERIOD
-key 53    SLASH
-key 28    ENTER
-        
-key 56    ALT_LEFT
-key 100   ALT_RIGHT
-key 42    SHIFT_LEFT
-key 54    SHIFT_RIGHT
-key 15    TAB
-key 57    SPACE
-key 150   EXPLORER
-key 155   ENVELOPE        
-
-key 12    MINUS
-key 13    EQUALS
-key 215   AT
-
-# On an AT keyboard: ESC, F10
-key 1     BACK              WAKE_DROPPED
-key 68    MENU              WAKE_DROPPED