Updated maven android plugin