Merge "Add common directory to BasicSyncAdapter sample" into jb-mr2-dev