Merge "Allow SkiaVkRenderEngine to not be compiled"