Merge "Fix dbus build."