Merge "Amend VR CTS for some GL and EGL extensions." into pie-cts-dev