Merge "Add test config to simpleperf_unit_test and simpleperf_unit_test" am: 4f6fd05205
am: c76a993f79

Change-Id: I8d879ae8f88199c3a479619f446a8facfa1ce194