Merge "surfaceflinger: fix fillRegionWithColor"