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

Change-Id: I988439f7d3191039f376f369ec2d763c4ae4afdc