Merge "Merge "Merge "Try harder to defeat GLSL compiler dead-code optimizations"...
authorIan Romanick <ian.d.romanick@intel.com>
Tue, 11 Apr 2017 18:12:00 +0000 (18:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Apr 2017 18:12:00 +0000 (18:12 +0000)
am: d07ebc4c7d

Change-Id: Ia16416301c0f380b7f28c4c168fb5f0e896a765f


Trivial merge