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

Change-Id: Ib5175e2dee41d05bcc22626a10eff7e07011ef62