Merge "Fix 'expected str instance, bytes found' error when compute patches"...

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

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



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