Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev
authorTreehugger Robot <treehugger-gerrit@google.com>
Tue, 11 Apr 2017 16:56:42 +0000 (16:56 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 11 Apr 2017 16:56:43 +0000 (16:56 +0000)

Trivial merge