Merge "Add libpng_ndk variant"
am: dfa9650494

* commit 'dfa9650494e1b69740e434b9e035d8954a8c4d09':
  Add libpng_ndk variant