Merge "simpleperf: fix a check error." am: 89bf4d4276
am: a2f8d9cbbd

Change-Id: Ia2b9084cc471eab895db31a509e73eb30234d441