Merge "simpleperf: make atest happy." am: 14638b2b85 am: 0ecc9575a3
am: 98e1cb070f

Change-Id: I0710c24fc6eeb092d0b84111492b0eb78465c64b