Merge "Switch to HexEncoding from ByteStringUtils" into qt-dev-plus-aosp