Support changes in latest Android plugin