Merge "Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat...