Merge "SurfaceFlinger HWC overlay API"