Replace unicode with six.text_type to support python3.X

Python 3 doesn't support unicode(), use six.text_type instead.
Partial-Bug: #1284677

Change-Id: I2737c62e3bc1dc758033d488e6324ca7bfbc4881