Updated Android building plugin