Merge change 22984 into eclair

* changes:
  fix AbstractThreadedSyncAdapter to actually cancel syncs