Merge "Remove py2 usages" am: a773d405 am: a0ef72ec am: cf6787a0 am: 9ac03302

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



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