Update Android plugin structure