Merge "Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat...
authorIan Romanick <ian.d.romanick@intel.com>
Tue, 22 Aug 2017 21:13:42 +0000 (21:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 21:13:42 +0000 (21:13 +0000)
am: 4238a089a6

Change-Id: I7d4bf6b03ead148b78e66a59c9843c91397235cc


Trivial merge