am 68bfe1fe: am 05f0a81a: Merge "Add libpng include path"

* commit '68bfe1fea6b6d7976e09b447f589ee51c86e7483':
  Add libpng include path