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

Change-Id: Ic24aecaf202de6e2854b253eb4c43285c2708a13