[automerger skipped] rm -rf non-AB code am: c74843c5 -s ours am: fc4202a3 -s ours

am skip reason: Merged-In I3d82d9031446be355d8a1d077ab83283c7cc769c with SHA-1 c7ebad5f is already in history

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



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