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

Trivial merge