[Android] Updates to fix plugin issues.