Add support for Android plugin 0.10 and 0.11