merge from open-source master

Change-Id: I483fedf77d978b1c6e52d73eebc14f011bb9f809

diff --cc linker/linker.c
index 5cc05e2,87fb19b..6719b12
--- 1/linker/linker.c
--- 2/linker/linker.c
+++ b/linker/linker.c
@@@ -468,8 -470,8 +468,8 @@@ _do_lookup(soinfo *si, const char *name
  
              DEBUG("%5d %s: looking up %s in %s\n",
                    pid, si->name, name, lsi->name);
 -            s = _do_lookup_in_so(lsi, name, &elf_hash);
 +            s = _elf_lookup(lsi, elf_hash, name);
-             if(s != NULL)
+             if ((s != NULL) && (s->st_shndx != SHN_UNDEF))
                  goto done;
          }
      }