Merge "Update bootstat_test to really work host-side"