Merge "Clarify Android changes to Formatter, GregorianCalendar"