Merge "Fix 'expected str instance, bytes found' error when compute patches" am: 5cf8eef2

Original change: https://android-review.googlesource.com/c/platform/build/+/2298037



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