Merge "simpleperf: replace config file with cmdline options." am: e5ad887a62
am: 271a040687

Change-Id: Ieb735fa3f8ecbcc8a037e114faecd94ad73e6748