The roll in r996 requires some additional changes in order
to make the GYP generation script to run properly.

BUG=none
TESTED=trybots passing.
R=fbarchard@google.com

Review URL: https://webrtc-codereview.appspot.com/10799005

git-svn-id: http://libyuv.googlecode.com/svn/trunk@997 16f28f9a-4ce2-e073-06de-1de4eb20be90