Merge "Fix python3 incompatiable code" am: 7a048996b7

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

Change-Id: I40b3874d5efb550d2756cf528ca54c615e5d4804