Merge "logcat: add 'kernel' to defaults" am: c7fe1552d5
am: 3c57b7f3a3

Change-Id: Ie42f253830a02a6d4e8cd9e41b0f12e585ec694a