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