Merge "resolve merge conflicts of ae3759c7 to deqp-dev" into deqp-dev
authorTreehugger Robot <treehugger-gerrit@google.com>
Fri, 14 Jul 2017 18:39:46 +0000 (18:39 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 14 Jul 2017 18:39:46 +0000 (18:39 +0000)

Trivial merge