am 7746546b: Merge "logcat: build regression"

* commit '7746546b89bf2da44eb058a4053dd4505d00d824':
  logcat: build regression