Merge "Revert "Add unit tests to Calendar.Builder.""