Merge "Add vendor_available:true to libpng" am: 352e6a8ec0
am: de0f581b1e

Change-Id: I5f7c360bff58ef2cf7e4cbb19e3539d36ba22982