Merge "[RenderEngine] Fix test build for RenderEngine refactor"