update play service
Merge remote-tracking branch 'origin/master'

Conflicts:
	project.properties
	res/values/strings.xml