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

* commit '51c6ad178e723a4cd59a143dd48d81ccdce2d489':
  logcat: build regression