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

Change-Id: If83c79fa1e72b043af12ea67d09e738cd6c95bd3