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

Change-Id: I0cfb33135f3bd20bfd08156a0d369a9ac88876f4