Update Google Maps SDK to 1.2.1
Merge pull request #1931 from jhersh/master

Update Google Maps SDK to 1.2.1