Fix google play services/maps dependencies