Merge pull request #7836 from natural-law/v3

Update the reference of submodule cocos2d-console.
use macro to control whether to use jpeg, tiff, webp or not
fix compiling error on android and fix some coding style
Merge pull request #7839 from minggo/revert-ccimage

Revert ccimage