Update play-services version
Merge branch 'master' into static