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

Change-Id: Ie095ec5e2301fb0fc2db1350b43056b06fd6b617