Merge "SurfaceFlinger: Missed changes in HWC1. Fix build error."