am 72abaab3: am 28c25d2b: Merge "Let classloader provide correct LD_LIBRARY_PATH"

* commit '72abaab326cc027e3ca3ed543009ca62c0e64308':
  Let classloader provide correct LD_LIBRARY_PATH