am 50484452: Rename calendarcommon to calendarcommon2 to workaround OEM silliness

* commit '504844526f1b7afec048c6d2976ffb332670d5ba':
  Rename calendarcommon to calendarcommon2 to workaround OEM silliness