Update to support android plugin 0.10.+