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

Change-Id: I99b381e9a7bcfc8921cbbd4e70d895781dc7cb65