Merge branch 'stock+' into stock+-media
Backport UHID driver

Change-Id: Ie6c6e47a7d685e18621f0984b4febbc0f952cc88
defconfig: enable uhid for all cm supported devices

Change-Id: If2308495ca51ab5536477d332aa147191adbcfe8