Merge "Ignore LD_LIBRARY_PATH when determining file type in ldd."