Merge "Revert "libpng 1.6.10 enable NEON Optimizations""