Merge "Make libpng recovery_available"
am: 4b8da58d51

Change-Id: Idcd89a413aa7efc4bc7ccc36f64d0c63e5bd6624