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

Change-Id: I48b598b16891aca67372e365ae775a42fd2ce4ba