am 2f62edf7: Merge "libdiskconfig: Turn on -Werror"

* commit '2f62edf77d94caaca57ff5e36bd866e02f3c2fa0':
  libdiskconfig: Turn on -Werror