am bea98acf: reconcile open-source froyo into google variant

Merge commit 'bea98acfa2253796aeade605c7020a7cc942af41' into gingerbread

* commit 'bea98acfa2253796aeade605c7020a7cc942af41':
  Explicitly enable backup by default in SDK builds