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

Change-Id: I721621794f4555daaa28f0a97ae77cf10c23ebf3