Merge "Fix more issues with python3 conversion of build_verity_metadata.py" am: 4e69dcd3fa am: 8c15f1a834 am: 583ce8b45d am: bdc7bdab69

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2064888

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