Merge "Move the set up of uploadArchives to SupportLibraryPlugin"