Gradle build updated to create correct .aar artifact