resolve merge conflicts of 38b88a4 to nyc-dev-plus-aosp

Change-Id: I5257d0e03723d7a89f7efbe7134ae35a917bfece

diff --cc linker/linker.cpp
index b911f18,4478c12..7d79574
--- 1/linker/linker.cpp
--- 2/linker/linker.cpp
+++ b/linker/linker.cpp
@@@ -4280,9 -4281,8 +4280,9 @@@ static ElfW(Addr) __linker_init_post_re
    fflush(stdout);
  #endif
  
 -  TRACE("[ Ready to execute \"%s\" @ %p ]", si->get_realpath(), reinterpret_cast<void*>(si->entry));
 -  return si->entry;
 +  ElfW(Addr) entry = args.getauxval(AT_ENTRY);
-   TRACE("[ Ready to execute '%s' @ %p ]", si->get_realpath(), reinterpret_cast<void*>(entry));
++  TRACE("[ Ready to execute \"%s\" @ %p ]", si->get_realpath(), reinterpret_cast<void*>(entry));
 +  return entry;
  }
  
  /* Compute the load-bias of an existing executable. This shall only