Merge "Mark libpng as double_loadable" am: c85cbbda3d
am: bccea7a861

Change-Id: I7040e0723974f51eab0c8ee059568b73d15778df