Merge "Follow rename of tagsouplib to tagsoup" am: 2328a856db am: f41e16b37b
am: 7b989d85ce  -s ours

Change-Id: Ie9c60a29ef8b9e9c9ac0d652f3474715ea4fd21f