Merge "[SurfaceFlinger] Remove hwc1 header."