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

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