Merge "Revert "Add a simple SurfaceFlinger stress test.""