Merge "ueventd is now at /system/bin/ueventd" am: aceb244401
am: 89048728f3

Change-Id: I72c7db988d81cda296e640cfcdcd63fc70bfb3a1