Merge "Follow rename of tagsouplib to tagsoup"
am: 2328a856db

Change-Id: Id95cded1727cda63639135d6db4d787815b1bc3c