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: 158803cd39

Change-Id: I10ef12f4f925a35ea48d06a4c286f38c56110707