Merge "Merge "Remove tests affected by NV/OES_viewport_array extension am: 267c765690...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 20 Jan 2017 20:44:00 +0000 (20:44 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 20 Jan 2017 20:44:00 +0000 (20:44 +0000)

Trivial merge