rhine: merge sony 4.3 changes

Change-Id: Iea2091e3a5fb0df5c8b843dc3c35c3fe0e45d75e

Conflicts:
	rootdir/ueventd.qcom.rc