Merge "update httplib2 version"

No match.