Merge "Mark libpng as double_loadable"
am: c85cbbda3d

Change-Id: I4f81d20c65fcd71d1e412b1c3c7057ec1e0db89a