Merge "Update to curl 7.61.0 - July 11 2018." am: 4855cc3da3
am: f7bbc49291

Change-Id: I6c368114a1b85a99d24c38675177cd651faadbf3