Merge "logcat: add 'kernel' to defaults"