Fix non-add-on handling of libc-abis.