Merge "HWUI: set correct sampler for external texture in shaders"