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

Change-Id: If5c184b78ccfb968a2b09f65735b0eecc47c2663