Merge "Fix dlsym() to take into account RTLD_GLOBAL/LOCAL"