Merge "Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat...
authorIan Romanick <ian.d.romanick@intel.com>
Tue, 11 Apr 2017 17:27:32 +0000 (17:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Apr 2017 17:27:32 +0000 (17:27 +0000)
am: 768446b015

Change-Id: I008fce677439c28c74c93981b2571b340d231444


Trivial merge