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

* commit '1180d71c3062a4f5b124ced3693a6a937ffbc13a':
  Remove explicit passing of dynamic loader name