Merge "Explicitly enable backup by default in SDK builds" into froyo