Merge cherrypicks of [1012516] into androidx-vectordrawable-release

Change-Id: I47997a600657d998f139eb90266794dae58e72fe

buildSrc/src/main/kotlin/androidx/build/CreateAggregateLibraryBuildInfoFileTask.kt

diff --git a/buildSrc/src/main/kotlin/androidx/build/CreateAggregateLibraryBuildInfoFileTask.kt b/buildSrc/src/main/kotlin/androidx/build/CreateAggregateLibraryBuildInfoFileTask.kt
index 5b2ef16..2db3f6f 100644
--- a/buildSrc/src/main/kotlin/androidx/build/CreateAggregateLibraryBuildInfoFileTask.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/CreateAggregateLibraryBuildInfoFileTask.kt
@@ -50,7 +50,7 @@
     }
 
     private data class AllLibraryBuildInfoFiles(
-        val Artifacts: ArrayList<LibraryBuildInfoFile>
+        val artifacts: ArrayList<LibraryBuildInfoFile>
     )
 
     /**
@@ -63,7 +63,7 @@
         val gson = Gson()
         val jsonString: String = jsonFile.readText(Charsets.UTF_8)
         val aggregateBuildInfoFile = gson.fromJson(jsonString, AllLibraryBuildInfoFiles::class.java)
-        aggregateBuildInfoFile.Artifacts.forEach { artifact ->
+        aggregateBuildInfoFile.artifacts.forEach { artifact ->
             if (!artifactList.contains("${artifact.groupId}_${artifact.artifactId}")) {
                 println("Failed to find ${artifact.artifactId} in artifact list!")
                 return false
@@ -83,7 +83,7 @@
         // Loop through each file in the list of libraryBuildInfoFiles and collect all build info
         // data from each of these $groupId-$artifactId-_build_info.txt files
         var output = StringBuilder()
-        output.append("{ \"Artifacts\": [\n")
+        output.append("{ \"artifacts\": [\n")
         var artifactList = mutableListOf<String>()
         for (infoFile in libraryBuildInfoFiles.get()) {
             if ((infoFile.isFile and (infoFile.name != outputFile.name))