Removed import com.caldroidsample.R from last PR.  Fixes demo package name and demo app name.