Merge \"logcatd: add stop and clear actions am: 2d737011d6  -s ours\" into nyc-mr1-dev-plus-aosp
am: 2d4492b088

Change-Id: Id6d2d9091511ecb83f71edfffaa53645d9578c45