am e74baca6: Merge "logd: Build Breakage"

* commit 'e74baca6f317ea54cb08c310eba86b5e6f6e73de':
  logd: Build Breakage