Updated Android for libpng changes.