Merge "surfaceflinger_displayhardware_fuzzer: Bug Fix"