Refactor support library

Test: None
Change-Id: I92e450c739fc9d77e8f8840bed4165ab88247fd6
diff --git a/annotations/build.gradle b/annotations/build.gradle
index 15274fe..d55583e 100644
--- a/annotations/build.gradle
+++ b/annotations/build.gradle
@@ -13,8 +13,8 @@
     // themselves have been manually extracted into the
     // external-annotations directory, and those are packaged separately
     // below by the annotationsZip task.
-    exclude('android/support/annotation/ProductionVisibility.class')
-    exclude('android/support/annotation/DimensionUnit.class')
+    exclude('androidx/annotation/ProductionVisibility.class')
+    exclude('androidx/annotation/DimensionUnit.class')
     preserveFileTimestamps = false
     reproducibleFileOrder = true
 }
@@ -54,7 +54,7 @@
     name = "Android Support Library Annotations"
     publish = true
     mavenVersion = LibraryVersions.SUPPORT_LIBRARY
-    mavenGroup = LibraryGroups.SUPPORT
+    mavenGroup = LibraryGroups.ANNOTATION
     inceptionYear = "2013"
     description = "The Support Library is a static library that you can add to your Android application in order to use APIs that are either not available for older platform versions or utility APIs that aren't a part of the framework APIs."
 }
\ No newline at end of file