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

Change-Id: I1979ba56684d5f1e05bf18e9bd992d5d53139306