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

Change-Id: Ib3b25ea5e502249beddd55fe5fb911e900e3d125