Merge "logcat: include 'kernel' and 'security' buffers in logcat --help" am: abdf6f2938 am: 2c04fbde39
am: 65dcfa259b

Change-Id: I41be4c5e1e79fd3719afd17df539118445dfa0c0