am 9c1cbe83: am 53cd1484: am aead003c: Merge "Don\'t set LD_LIBRARY_PATH globally."

* commit '9c1cbe8373f28c9a6d6ba489af3e9247647dc469':
  Don't set LD_LIBRARY_PATH globally.