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

Change-Id: I7c4fc87b304502dd9b2bb4898d945825592f86f3