am 957ffcb2: Merge "Fix SimpleDateFormatTest.java and SimpleTimeZoneTest.java\'s assumption"

* commit '957ffcb2fb45527b10b5e28e083c48ca6e65c5ea':
  Fix SimpleDateFormatTest.java and SimpleTimeZoneTest.java's assumption