Merge "Remove Enum.h error-only header"