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

Change-Id: I6372f76314059de504007dc64a211eb3f3087248