Merge "simpleperf: restore perf_harden after simpleperf cts test." into nyc-dev