Merge "Add libpng_ndk variant"