Merge "Fix RTLD_NEXT/DEFAULT lookup"