Merge pull request #711 from sgrenier/next

Added Terrain test to gameplay-tests
Update build script for Android.
Update Android Ant script.
Merge pull request #712 from kwhatmough/next

Update build script for Android.
Update remaining scripts for flattened shaders folder.
Changed PlatformBlackBerry to use BLACKBERRY_USE_GAMEPAD
Merge branch 'next' of https://github.com/blackberry/GamePlay into next
Merge pull request #714 from seanpaultaylor/next

Next
Merge pull request #713 from kwhatmough/next

Update remaining scripts for flattened shaders folder.
Fixed terrain fragment shader compile error on GL ES.