Merge "Use recovery variant for librecovery_ui_ext" am: 910adf418b

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1750168

Change-Id: I79d4372d919a7435174ac2b1229f8516d2283026