Use import from six.moves to import the httplib module

The name of the httplib module is http.client instead of
httplib in Python3.

Change-Id: I52a95ea2ff005c2ffbd13d6650367fe80329ce46
Merge "Use import from six.moves to import the httplib module"