Merge "Convert tagsoup to Android.bp" am: 658e03e800 am: 877497e7b0 am: 0ab2173358  -s ours
am: 4268d7ce16  -s ours

Change-Id: Icc567db40e26b98729ad29377cf5ae80361c6628