Warning fix in CCDeprecated.cpp and CCGLProgramState.h
Merge pull request #6671 from dumganhar/deprecate-cpp-warning-fix

Warning fix in CCDeprecated.cpp and CCGLProgramState.h
Linux android build fix
Merge pull request #6672 from dumganhar/linux-android-fix

Linux android build fix
Update Android.mk
updated changelog
Merge pull request #6673 from ricardoquesada/changelog

updates changelog