... and get rid of LD_LIBRARY_PATH hack in wrapper shell script.

Change-Id: I7d91c6086460504d656de7b018087264165f396b