resolved conflicts for merge of ae69a958 to lmp-mr1-dev-plus-aosp

Change-Id: Ia466577ef6e627cc6fcef46aa37cce21acbc8519

linker/linker.h

@@ -206,6 +206,7 @@ struct soinfo {
   void CallConstructors();
   void CallDestructors();
   void CallPreInitConstructors();
+  bool PrelinkImage();
   bool LinkImage(const android_dlextinfo* extinfo);
 
   void add_child(soinfo* child);
@@ -223,6 +224,7 @@ struct soinfo {
   int get_rtld_flags();
 
   soinfo_list_t& get_children();
+  soinfo_list_t& get_parents();
 
   ElfW(Addr) resolve_symbol_address(ElfW(Sym)* s);