Merge "libdiskconfig: Turn on -Werror"