Proper fix for libpng16 includes.
Improve Blackberry CMake toolchain.