Merge "Use ro.logd.kernel for kernel logcat"
am: d443dd327a

Change-Id: I336a9cf9acf5cd38d3e432cd2a2845c6fa56ced8