Merge "Move libdiskconfig headers into libdiskconfig."