Merge "libpng - enable neon support"