Merge "Remove references to libc_scudo."