Merge "Modify SurfaceView to use SurfaceFlinger child surfaces."