Strichartz estimates for non-trapping metrics