Merge "Add libpng_ndk variant" am: dfa9650494
am: 2789184928

* commit '27891849287a1bbc726ec81a29b6d72eae26f6e3':
  Add libpng_ndk variant