More Calendar unbundling

A few minor items:
- Remove an unnecessary import, missed in previous checkin.
- Drop guava from libs (not currently needed).
- Add commented-out build lines for the benefit of anyone who wants
  to experiment.

Bug 4575374

Change-Id: I5669e41008a97810f9c23247447e91637c54bc22
4 files changed