Merge "sm: use logcat over dmesg" am: 6ae4e4c182 am: c04b1af5e7
am: 4d559cef01

Change-Id: Ia56996aec65314a7c4c64ca794183010fb7f0dd9