am 40ed6797: am 33462598: am bea98acf: reconcile open-source froyo into google variant

Merge commit '40ed6797ee0a734ec7af041b84998c610968503a'

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