Use import from six.moves to import the queue module

The name of the synchronized queue class is queue instead of
Queue in Python3.

Change-Id: I89ea14e8d17cd37706752700cedb66b28d347fa2
Merge "Use import from six.moves to import the queue module"