Merge "Make ueventd error messages indicate where the error is in ueventd script"
am: fd72bbe91f

Change-Id: I5a6637721475e5cc6cef6e1240b8ce753fc983f5