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

Change-Id: I4b6cf1587671fba18b5bc5b45d8f0352c436a75c