!UPSTREAM: Fix core-inputs test.

TODO:
- Write a commit message
- Possibly combine with Nick's "Change the geometry shader output layouts from 'triangles' to 'triangle_strip' because 'triangles' should be invalid"