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

Change-Id: I79c99afb7b24abdf4d0deae9095161c65080d0c4