Merge "logcat: fix tests broken from new formatting"