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

Change-Id: I17b896b07a4d3d8d19fcd108f82da48e990a1177