Merge \"logcatd: Do not su for setprop\"
am: 0dbe899d98

Change-Id: If60fb6ce8ddcfa8b9d686ae92aa0b0e3387a5fc5