Merge "Use tags to access conscrypt sources" am: 5b0971801f am: 5179aa1472 am: 66443ee42c

Change-Id: I00f5c8a149f35e7ec229d3b29e91696bab0928e8

ApiDocs.bp

@@ -66,7 +66,7 @@ stubs_defaults {
         ":opt-telephony-srcs",
         ":opt-net-voip-srcs",
         ":art-module-public-api-stubs-source",
-        ":conscrypt.module.public.api.stubs.source",
+        ":conscrypt.module.public.api{.public.stubs.source}",
         ":android_icu4j_public_api_files",
         "test-mock/src/**/*.java",
         "test-runner/src/**/*.java",

StubLibraries.bp

@@ -69,7 +69,7 @@ stubs_defaults {
     name: "metalava-full-api-stubs-default",
     defaults: ["metalava-base-api-stubs-default"],
     srcs: [
-        ":conscrypt.module.public.api.stubs.source",
+        ":conscrypt.module.public.api{.public.stubs.source}",
         ":framework-updatable-sources",
     ],
     sdk_version: "core_platform",