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

Change-Id: I201f349f32fd18b5a94c9e907115d9f1fd37819d