updated android plugin architecture