Merge \\"logcatd: add stop and clear actions\\" am: 2546a7f8fd
am: d62a49b202

Change-Id: If43511b6ad876695cfb1b7993cb4355e5d9e475e