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

Change-Id: Ib1f4d25932b0d06aa8fdad1cc145503717de535e