Merge https://android.googlesource.com/platform/external/libpng into kk-devel

Conflicts:
	Android.mk
Revert "libpng: do not lower standard to isognu89"

This reverts commit aaf0509514b93dc340383b3bd8248eb1dbcfeada.
 - fixup for cfx