Merge "simpleperf: improve warning msg." am: 668f19e1a9
am: e9a7352108

Change-Id: I3f3ac12eff4cc3472d454842fe12e23f3b953afa