Merge "Convert tagsoup to Android.bp" am: 658e03e800
am: 877497e7b0

Change-Id: I5c691a6ac6a1ce00142d27582420b1728afcd92d