Merge "SurfaceFlinger: fix SFFakeHWC_test"