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

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