Updated to new version of android plugin