Merge \\"simpleperf: fix build id check of files in symfs.\\" am: 3077c433d5
am: 7d626d6e35

Change-Id: I2b997b3f1de65ae0a119782cf898d3f4ea4f568e