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

Change-Id: I1e785df69dc2126674478326b86101b5439802a0