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

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