Merge "BUILD_(HOST|TARGET)_TEST_CONFIG errors by default"