libdvdcss: Sync some minor changes from upstream, up to r237