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