Merge "logcat: switch to <regex>." am: 5af75ed172
am: f2b99fc36f

Change-Id: I2196f0fdd1e5be895381fa0aab3db5bc830114b5