Modified Android plugin to work with new apis