Merge "Add test config to bootstat_tests" am: 3d5cd59d73
am: 5358155528

Change-Id: Ifae2a5b6ca7058d4876a78612bb16c79dc752edc