Fixing when not using GP_USE_SOCIAL.
Merge branch 'next' of https://github.com/dducharme/GamePlay into next
Merge branch 'next' of https://github.com/blackberry/GamePlay into next

Conflicts:
	gameplay/src/social/GooglePlaySocialSession.cpp
Merge branch 'next' of https://github.com/dducharme/GamePlay into next