Fix compilation problems with new version of soup library

Change-Id: I642d2dd50c89894fd5bfa24a3b4e78c5a4a87281