am 8d782f51: am 3f55d2f4: Merge "logcat: test: modernize"

* commit '8d782f5170960f023a77be656e60398390aa58aa':
  logcat: test: modernize