Merge "Upgrade curl to curl-7_67_0" am: ef60c97e34
am: 20c1fa87d3

Change-Id: I8682b54cc5907e46f0eef770c979bc4bc76e645d