[Instrumented libraries] Fix build_and_package.py under python3

This adds a commit that was accidentally not included in the previous
CL [1].

This CL also includes a fix when symlinking libcurl.so when doing an
incremental build.

[1] https://crrev.com/1078666

R=thestig

Change-Id: I9e44b0ca3a8fd6ae77f7df5d8b64fffc42ab7e2b
Bug: 1260217
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4081755
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1080405}
NOKEYCHECK=True
GitOrigin-RevId: 97c60ec96603acee3b3528e9922e29aa217b26c7
2 files changed