Merge "Fix HOST_LIBRARY_PATH."