Merge "Build tagsoup with sdk_version := "core_current"" am: b40d1a29da
am: 1ca37b2fe3

Change-Id: Id96b1b00fd145bb74359d07cb4c3d1ed0dcd3b5c