Move one more file into right package.
Better synchronization around SyncAdapter creation.
Add newer constructor.