Net neutrality means that content is freely available to all. It does not mean that an ISP has to provide the same services to all of it's users. At best it means that everyone has the opportunity to purchase or lease said services without bias or prejudice.
I don't see Google as having shifted their stance at all. They're merely talking from a different viewpoint on the issue, and just so happen to agree with pretty much every other ISP on the planet: if you want to run servers, you pay for business class services.