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

Change-Id: Ieb7beb5d7a263c0b58ca77967ac9ce01720de841