am 04f0b198: Merge "Revert "libpng 1.6.10 enable NEON Optimizations""

* commit '04f0b19899c66ffeadf74a7b9a6f404aef905b79':
  Revert "libpng 1.6.10 enable NEON Optimizations"