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:14:07 +0000 (21:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 21:14:07 +0000 (21:14 +0000)
am: f69e9e35f8

Change-Id: I956dc5f619f030d91a7cb6c20bffe6dc3aad863a


Trivial merge