Merge pull request #716 from seanpaultaylor/next

Next
Added TerrainTest to CMake builds
Fixed terrain fragment shader compile error on GL ES.
Merge branch 'next' of https://github.com/blackberry/GamePlay into next
Merge pull request #717 from sgrenier/next

Fixes terrain fragment shader compile error on GL ES
Merge branch 'next' of https://github.com/blackberry/GamePlay into next
Rebuilt gameplay-encoder for normalmap generation on RAW files