Merge "Make libpng recovery_available" am: 4b8da58d51 am: 62f5255389
am: ec756c3e7a

Change-Id: I3ced522d1de161f810a7fcdcb8797bb3dbabb7c6