tweaks for Calendar.java cleanup

-replaced interface refs with class refs
-method signature changes

Change-Id: I65bfc58a59ae8775098a44d8dec8850919b6211c
4 files changed