Updated Android for libpng changes.
Merge pull request #1176 from seanpaultaylor/next

Updated Android for libpng changes.