Followup to r347996

Replace uses of foo.encode("hex") with binascii.hexlify(foo) for forwards
compatibility between python 2.x and python 3.

PR: 237403
MFC after: 1 week