John Reck 5527fd1323 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2
am: 1b1fcbaab5

* commit '1b1fcbaab5169f824e803bcd97aa848e27dbcafb':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I40b173cbfd5fbec21a2b194b573a246af534c315
2016-05-19 22:16:42 +00:00
..