Merge "Permissions for /dev/uinput" am: 9f96cc20a2 am: e861121536
am: 89e868ddd1

Change-Id: I51cac3be64edb80cd9ba0a9b11f3cb8e5cb30091