Merge "Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat...