Merge "SF: Fixup call expectations in libsurfaceflinger_unittest"