Merge "Use ro.logd.kernel for kernel logcat"