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

* commit '5dec2c77032436a1e03644c7830d9d3ffc1ec8d4':
  Remove explicit passing of dynamic loader name