Android plugin changes