am aead003c: Merge "Don\'t set LD_LIBRARY_PATH globally."

* commit 'aead003c8bc677218329c535b063a5bb66695414':
  Don't set LD_LIBRARY_PATH globally.