resolve merge conflicts of 86a28d0a to klp-modular-dev am: a5bc5962 am: 36acff7d am: 1f814d76 am: ca45737e am: 8a1d4e97 am: aa02888e am: 300af077 am: fc1d9a49 am: b02b2fe3 am: 75dea9ca am: 8a55c653
am: b898481d

* commit 'b898481d':
  DO NOT MERGE Use updated libpng API

Change-Id: I5cdfad96ed0a6ffde2c197ef7957192d9b0c1a16