Fix for scheduling conflicts, address fred's comments

The last set of comments asked for a renaming. Rather than
confuse the issue now, this patch set focuses on the internals
and API changes can come later.
Renamed AnonymousSyncAdapter -> SyncServiceAdapter

Change-Id: I596ea2f7367b83b357b2f4b56e069448d5591b2a