Adapt android to latest add_env_to_user API