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

Change-Id: Ib8c5dbb184b97066077f9736122642460ada1fd4