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

Change-Id: I2203c3161e03f1024447d405d7091bd45b5141cf