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

Change-Id: I49c95a02ec49c066345e0c15292fef0732c5bbe2