Merge "Let classloader provide correct LD_LIBRARY_PATH"