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

Change-Id: I13f674f9467fa92e1e9ea24ec9b7787cefc41a19