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

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

Change-Id: I4eb5b2033c1fd3c9dbbcd31db7acef9d83d6c1b7