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

Change-Id: Ie4cec0cf71c230240914d40afa1f57212fb35270