Merge \"simpleperf: restore perf_harden after simpleperf cts test.\" into nyc-dev
am: 4d9e9c66fb

Change-Id: I39119b7d227b946e294b40bfd6805d886d92fa8b