Forward compatibility fixes

Summary: ...

Test Plan: upgrade libpng and win

Reviewers: randall.rushing

Differential Revision: http://review.codefirex.com/D422
Forward compatibility fix

Summary: ...

Test Plan: ...

Reviewers: randall.rushing

Differential Revision: http://review.codefirex.com/D423