Merge "Remove JapaneseCalendar.CURRENT_ERA from Android public SDK"