Merge "Fix dlsym_failure NULL handle test"