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

Change-Id: I41c3015bb4048fd526b83487de2c574651ea79e0