M-Theory And Heterotic String Theory On Special Holonomy Fibrations