Merge "Allow input system access to /dev/v4l-touch" am: f6363989f4
am: 31209d7ada

Change-Id: I632deff2bca30474d9cd603741f6423988180297