Merge "liblog: expect content only if ro.logd.kernel is enabled"
am: 1f87959cf7

Change-Id: I457845e07086e0be48fc3733a6f6200d772547c9