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

Change-Id: I98a839ca4c04f8325343d02be4fddfd3665a9e37