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