Update to new android plugin