Merge "Fix SimpleDateFormatTest.java and SimpleTimeZoneTest.java's assumption"