Merge "Add patch symlinks." am: dadcd34e04 am: 4ccd0fcd99

Original change: https://android-review.googlesource.com/c/platform/prebuilts/build-tools/+/1193492

Change-Id: I3f8644c3ab3147f1be32bddf4d9e30017152b149