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

Change-Id: Idc0e6af5323a2bc986187fc81cc8aa3d326b0160