am c9fc3db5: am 7746546b: Merge "logcat: build regression"

* commit 'c9fc3db55b6a54dde740ba558a98835ea6552190':
  logcat: build regression