Support dconf 0.13.4

TEST=Manually

Review URL: https://codereview.appspot.com/6426044

Conflicts:
	conf/dconf/config-private.h
	conf/dconf/config.h
	dconf/config.h