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

Change-Id: I16b2e6b6c6cffcbe6b847997e0b9d579911c7e17