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

* commit '4700dfa0fbb9be31809b250c001d0275ce0b38dc':
  logcat: test: modernize