Merge "API REVIEW: android.widget.CalendarView" into jb-dev