Merge "SF: Fix sffakehwc_test setup"