I was going by your AP, the remaining IGETC and 3 poli sci requirements. That equaled 8 courses. Then you mentioned macro-econ and stats. So that’s 10. The buffer is for any loss in AP credit. But trust me, the only people who can tell you straight is Berkeley admissions. I’ll see if I can find the number for AP credit evaluation.
By go over, they will tell you specifically what credits you are getting and how your major courses might affect the count.