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

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

Change-Id: I8af896ea64f27a61a869fffd59462fdfeb62a792