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

Change-Id: I65a30664a0b4af8d032a687bc5ac2d7e5b345a81