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

Change-Id: Idaba68a0b7bb957af60fbdb25c1db5045499691c