Merge "Add uhid_device to system_server"