Fix more issues with the build to bring in only the AARs