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

Change-Id: I8d249346fcd4459a81e5a2a8943b7223c7cb66bd