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

Change-Id: Ifa7d123cbbbbc7eba22d34e9f5c6a99db71f5fb6