Merge "Revert^2 "Define linker.recovery"" into main am: 03dfab5795

Original change: https://android-review.googlesource.com/c/platform/bionic/+/3400140

Change-Id: Ib2daf17504dfc25fbc5f7a4a90b459fd777ddda0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>