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

Change-Id: Ic7105b5c989235406dd68bb0fe0fce6c086106fe