Import Queue: fix for python 3

Original patch (using six) by Aaron Hill

Change-Id: I58970010bccbc675eeb494b3ff7b40fe0d314dd3