Merge "Fix LD_LIBRARY_PATH for host tests after update."