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

Change-Id: Id4b36cb07732686dba28fd6b129ec8a05097613b