Merge "Add unit tests for java.util.Calendar"