Fixing up compile errors.
Merge branch 'next' of https://github.com/blackberry/GamePlay into next