Merge "AOSP/Calendar - .java files deleted"