Update to Joda v2.2, upgrade to work well on ADT build 22