Merge "sm: use logcat over dmesg"