Merge "Revert^2 "Group surfaceflinger mock files for use in fuzzers""