Merge \"simpleperf: restore perf_harden after simpleperf cts test.\"
am: 33732ddfd3

Change-Id: Ibf4c201724d5254fed1db18e49ae8b1ccc6f05d3