Merge "logcat: add hidden --debug flag and cleanup"
am: c097c79b77

Change-Id: I50d28c3fc5f7ffbf1186ece2748e944bfdcf8a9f