Added Android template, new Ubuntu 20.04 ISOs and fixed arch

closes issue #1332 
fixes issue #1338