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

* commit '53cd1484aa13c43b4d6973c1c203dbff9c996d14':
  Don't set LD_LIBRARY_PATH globally.