am 2c448765: Merge "Remove explicit passing of dynamic loader name"

* commit '2c448765e1227327da7ce548114f13678baa9606':
  Remove explicit passing of dynamic loader name