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

* commit 'c8179498225dc44350c3addc932be97a9ef3a941':
  libdiskconfig: Turn on -Werror