Upgrade to maven android plugin 3.6
Project is working again.
Clean up