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

Change-Id: I5649fc456c92a918fc92e36e007378dd6ca45abb