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

Change-Id: I614cb8a32c44143e6c7630b1687c82fd1c9a8c5b