Merge "Gyp: Sanity Part II (GM+Tests)" into master-skia

https://skia.googlesource.com/skia/+/2e0303f91bdada6dddb73105a82f17601265379d

Change-Id: I65180c0a754355bb3efd055b7d7b9e612169866b