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

Change-Id: Id88551e5cb568b4d83d547d02bd0d22555971f5e