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

Change-Id: I8d067290fc39cf99917adc34219c207d1c4846d1