am 931c12b8: Merge "Fix dbus build."

* commit '931c12b844db778d1bde30e3cb4fd2bf04483fae':
  Fix dbus build.