am 174f30b1: am dc57f4d9: Merge "logd: build breakage in git_master-nova @ 1151709"

* commit '174f30b170693054abec89178e3ac7096a3cc06f':
  logd: build breakage in git_master-nova @ 1151709