Updated Android env matrix
Cleanup env vars during before_install