Six urllib parse contains py3's urllib.parse and py2's urllib. Replace urllib with six.moves.urllib.parse to keep compatibility. Change-Id: Ie67987e4ffb981c2ee70360f7fa9b3fe873c2a96 Closes-bug: 1280105