am e2a5c184: am 941bcedb: Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev

* commit 'e2a5c184e396b748e390672996ebeca25c2b9b83':
  Fix unsafety in SkiaShader storage, and texture unit accounting