Merge "Logd: Fix missing include of rc file" am: 054c099f1b
am: 31e78998b0

* commit '31e78998b03c70ba4f054f3d1e20933038bcd7b9':
  Logd: Fix missing include of rc file