[automerger skipped] Merge "Mark libpng as double_loadable" am: c85cbbda3d am: bccea7a861
am: f706b17cd5  -s ours

Change-Id: I9caa8493c49f1f0a6cd70b80751fb1758f974907