[Matahari] [PATCH] Fix some dbus related build issues.