Merge "Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 20 Jan 2017 20:41:15 +0000 (20:41 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 20 Jan 2017 20:41:16 +0000 (20:41 +0000)

Trivial merge