Merge "simpleperf: fix build_id checking."
am: 9fe57a62ae

Change-Id: I029e3ff597fcc29a337501a4aa342651b228e527