Merge pull request #1174 from seanpaultaylor/next

Next
Merge pull request #1175 from seanpaultaylor/next

Next
Fixing up compile errors.
Merge branch 'next' of https://github.com/blackberry/GamePlay into next
Merge pull request #1176 from seanpaultaylor/next

Updated Android for libpng changes.
Fixes broken LightingSample in sample-browser.