Merge "Add a base host test to deflake device tests"