Merge "simpleperf: fix test for vdso file." am: 631cca4f48 am: 79aed4e768
am: 9702c54722

Change-Id: Ie02a4a057955810e0e51843f745be6aff549db91