Merge "Remove py2 usages" am: a773d405d1

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

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