Merge "Merge "Merge "Try harder to defeat GLSL compiler dead-code optimizations"...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 11 Apr 2017 17:36:08 +0000 (17:36 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 11 Apr 2017 17:36:08 +0000 (17:36 +0000)

Trivial merge