Merge "Clean up and fix skia-RenderEngine tests"