Merge "Revert^2 "Added surfaceflinger_displayhardware_fuzzer""