Merge "Merge "ueventd: remove character device symlinks (/dev/usb/*)" am: f3ae82f57f" into stage-aosp-master
am: f038ee0d82

Change-Id: I4de99eac06e1b32820a9d1e5dde645c6e26e28cd