Merge "Revert "Modify SurfaceView to use SurfaceFlinger child surfaces.""