Merge "Link CalendarAstronomer statically in the system server"