Merge "logcat: include 'kernel' and 'security' buffers in logcat --help"