Use new Android plugin names