am 05f0a81a: Merge "Add libpng include path"

* commit '05f0a81a93f0d41fa4115c752e617849d145fe5b':
  Add libpng include path