Merge "Compilation fixes for QNX platform" into deqp-dev
authorTreehugger Robot <treehugger-gerrit@google.com>
Fri, 14 Jul 2017 18:18:52 +0000 (18:18 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 14 Jul 2017 18:18:52 +0000 (18:18 +0000)

Trivial merge