Merge "sm: use logcat over dmesg"
am: 6ae4e4c182

Change-Id: I08dade7cd53852cbf6d1ba0e70dfcc01cae492e9