Merge "Revert "Start running CtsUiRenderingTestCases and CtsGraphicsTestCases for skia changes.""