[PATCH 28/35] global_data: Move env_addr field higher