Merge "Make libpng buildable for native_bridge"