Stock+

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

Change-Id: If2308495ca51ab5536477d332aa147191adbcfe8
Merge branch 'stock+' into stock+-media