Merge "Fix ld_library_path now that a target can be 64bits only."